Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
0c45c4c6
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0c45c4c6
编写于
3月 08, 2018
作者:
I
igor-suhorukov
提交者:
Juergen Hoeller
3月 08, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lamdbas containing only one statement should not nest this statement in a block
上级
6163f2d3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
9 deletion
+6
-9
spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
...a/org/springframework/core/io/buffer/DataBufferUtils.java
+2
-3
spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceUrlProvider.java
...gframework/web/reactive/resource/ResourceUrlProvider.java
+2
-3
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelInitializer.java
...b/reactive/result/method/annotation/ModelInitializer.java
+2
-3
未找到文件。
spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
浏览文件 @
0c45c4c6
...
...
@@ -363,9 +363,8 @@ public abstract class DataBufferUtils {
Assert
.
isTrue
(
position
>=
0
,
"'position' must be >= 0"
);
Flux
<
DataBuffer
>
flux
=
Flux
.
from
(
source
);
return
Flux
.
create
(
sink
->
{
flux
.
subscribe
(
new
AsynchronousFileChannelWriteCompletionHandler
(
sink
,
channel
,
position
));
});
return
Flux
.
create
(
sink
->
flux
.
subscribe
(
new
AsynchronousFileChannelWriteCompletionHandler
(
sink
,
channel
,
position
)));
}
private
static
void
closeChannel
(
@Nullable
Channel
channel
)
{
...
...
spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceUrlProvider.java
浏览文件 @
0c45c4c6
...
...
@@ -100,7 +100,7 @@ public class ResourceUrlProvider implements ApplicationListener<ContextRefreshed
List
<
SimpleUrlHandlerMapping
>
mappings
=
new
ArrayList
<>(
beans
.
values
());
AnnotationAwareOrderComparator
.
sort
(
mappings
);
mappings
.
forEach
(
mapping
->
{
mappings
.
forEach
(
mapping
->
mapping
.
getHandlerMap
().
forEach
((
pattern
,
handler
)
->
{
if
(
handler
instanceof
ResourceWebHandler
)
{
ResourceWebHandler
resourceHandler
=
(
ResourceWebHandler
)
handler
;
...
...
@@ -111,8 +111,7 @@ public class ResourceUrlProvider implements ApplicationListener<ContextRefreshed
}
this
.
handlerMap
.
put
(
pattern
,
resourceHandler
);
}
});
});
}));
}
...
...
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelInitializer.java
浏览文件 @
0c45c4c6
...
...
@@ -92,14 +92,13 @@ class ModelInitializer {
bindingContext
.
getModel
().
mergeAttributes
(
attributes
);
bindingContext
.
setSessionContext
(
sessionAttributesHandler
,
session
);
return
invokeModelAttributeMethods
(
bindingContext
,
modelMethods
,
exchange
)
.
doOnSuccess
(
aVoid
->
{
.
doOnSuccess
(
aVoid
->
findModelAttributes
(
handlerMethod
,
sessionAttributesHandler
).
forEach
(
name
->
{
if
(!
bindingContext
.
getModel
().
containsAttribute
(
name
))
{
Object
value
=
session
.
getRequiredAttribute
(
name
);
bindingContext
.
getModel
().
addAttribute
(
name
,
value
);
}
});
});
}));
});
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录