Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
75d751d9
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,发现更多精彩内容 >>
提交
75d751d9
编写于
5月 20, 2019
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
上级
55e601c3
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
19 addition
and
20 deletion
+19
-20
spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java
...org/springframework/aop/framework/JdkDynamicAopProxy.java
+3
-3
spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
...java/org/springframework/beans/TypeConverterDelegate.java
+1
-2
spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResult.java
...ngframework/web/context/request/async/DeferredResult.java
+13
-13
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
...work/web/socket/sockjs/support/AbstractSockJsService.java
+2
-2
未找到文件。
spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java
浏览文件 @
75d751d9
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -154,7 +154,6 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa
@Override
@Nullable
public
Object
invoke
(
Object
proxy
,
Method
method
,
Object
[]
args
)
throws
Throwable
{
MethodInvocation
invocation
;
Object
oldProxy
=
null
;
boolean
setProxyContext
=
false
;
...
...
@@ -207,7 +206,8 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa
}
else
{
// We need to create a method invocation...
invocation
=
new
ReflectiveMethodInvocation
(
proxy
,
target
,
method
,
args
,
targetClass
,
chain
);
MethodInvocation
invocation
=
new
ReflectiveMethodInvocation
(
proxy
,
target
,
method
,
args
,
targetClass
,
chain
);
// Proceed to the joinpoint through the interceptor chain.
retVal
=
invocation
.
proceed
();
}
...
...
spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
浏览文件 @
75d751d9
...
...
@@ -522,8 +522,7 @@ class TypeConverterDelegate {
return
original
;
}
int
i
=
0
;
for
(;
it
.
hasNext
();
i
++)
{
for
(
int
i
=
0
;
it
.
hasNext
();
i
++)
{
Object
element
=
it
.
next
();
String
indexedPropertyName
=
buildIndexedPropertyName
(
propertyName
,
i
);
Object
convertedElement
=
convertIfNecessary
(
indexedPropertyName
,
null
,
element
,
...
...
spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResult.java
浏览文件 @
75d751d9
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -21,7 +21,6 @@ import java.util.concurrent.Callable;
import
java.util.function.Consumer
;
import
java.util.function.Supplier
;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
...
...
@@ -60,7 +59,7 @@ public class DeferredResult<T> {
@Nullable
private
final
Long
timeout
;
private
final
Long
timeout
Value
;
private
final
Supplier
<?>
timeoutResult
;
...
...
@@ -89,35 +88,36 @@ public class DeferredResult<T> {
* <p>By default not set in which case the default configured in the MVC
* Java Config or the MVC namespace is used, or if that's not set, then the
* timeout depends on the default of the underlying server.
* @param timeout timeout value in milliseconds
* @param timeout
Value
timeout value in milliseconds
*/
public
DeferredResult
(
Long
timeout
)
{
this
(
timeout
,
()
->
RESULT_NONE
);
public
DeferredResult
(
Long
timeout
Value
)
{
this
(
timeout
Value
,
()
->
RESULT_NONE
);
}
/**
* Create a DeferredResult with a timeout value and a default result to use
* in case of timeout.
* @param timeout timeout value in milliseconds (ignored if {@code null})
* @param timeout
Value
timeout value in milliseconds (ignored if {@code null})
* @param timeoutResult the result to use
*/
public
DeferredResult
(
@Nullable
Long
timeout
,
final
Object
timeoutResult
)
{
public
DeferredResult
(
@Nullable
Long
timeout
Value
,
final
Object
timeoutResult
)
{
this
.
timeoutResult
=
()
->
timeoutResult
;
this
.
timeout
=
timeout
;
this
.
timeout
Value
=
timeoutValue
;
}
/**
* Variant of {@link #DeferredResult(Long, Object)} that accepts a dynamic
* fallback value based on a {@link Supplier}.
* @param timeout timeout value in milliseconds (ignored if {@code null})
* @param timeout
Value
timeout value in milliseconds (ignored if {@code null})
* @param timeoutResult the result supplier to use
* @since 5.1.1
*/
public
DeferredResult
(
@Nullable
Long
timeout
,
Supplier
<?>
timeoutResult
)
{
public
DeferredResult
(
@Nullable
Long
timeout
Value
,
Supplier
<?>
timeoutResult
)
{
this
.
timeoutResult
=
timeoutResult
;
this
.
timeout
=
timeout
;
this
.
timeout
Value
=
timeoutValue
;
}
/**
* Return {@code true} if this DeferredResult is no longer usable either
* because it was previously set or because the underlying request expired.
...
...
@@ -155,7 +155,7 @@ public class DeferredResult<T> {
*/
@Nullable
final
Long
getTimeoutValue
()
{
return
this
.
timeout
;
return
this
.
timeout
Value
;
}
/**
...
...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
浏览文件 @
75d751d9
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -354,7 +354,7 @@ public abstract class AbstractSockJsService implements SockJsService, CorsConfig
String
requestInfo
=
(
logger
.
isDebugEnabled
()
?
request
.
getMethod
()
+
" "
+
request
.
getURI
()
:
null
);
try
{
if
(
sockJsPath
.
equals
(
""
)
||
sockJsPath
.
equals
(
"/"
))
{
if
(
sockJsPath
.
isEmpty
(
)
||
sockJsPath
.
equals
(
"/"
))
{
if
(
requestInfo
!=
null
)
{
logger
.
debug
(
"Processing transport request: "
+
requestInfo
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录