Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
b366e159
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,发现更多精彩内容 >>
提交
b366e159
编写于
12月 14, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fine-tuned handling of running state
Issue: SPR-14527
上级
5a290697
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
18 deletion
+17
-18
spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
...ve/socket/server/upgrade/JettyRequestUpgradeStrategy.java
+8
-12
spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java
.../web/socket/server/jetty/JettyRequestUpgradeStrategy.java
+9
-6
未找到文件。
spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
浏览文件 @
b366e159
...
...
@@ -37,11 +37,11 @@ import org.springframework.web.reactive.socket.adapter.JettyWebSocketHandlerAdap
import
org.springframework.web.reactive.socket.server.RequestUpgradeStrategy
;
import
org.springframework.web.server.ServerWebExchange
;
/**
* A {@link RequestUpgradeStrategy} for use with Jetty.
*
* @author Violeta Georgieva
* @author Rossen Stoyanchev
* @since 5.0
*/
public
class
JettyRequestUpgradeStrategy
implements
RequestUpgradeStrategy
,
Lifecycle
{
...
...
@@ -54,7 +54,7 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Life
private
ServletContext
servletContext
;
private
boolean
running
=
false
;
private
volatile
boolean
running
=
false
;
private
final
Object
lifecycleMonitor
=
new
Object
();
...
...
@@ -69,7 +69,7 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Life
this
.
factory
.
setCreator
((
request
,
response
)
->
adapterHolder
.
get
());
this
.
factory
.
start
();
}
catch
(
Exception
ex
)
{
catch
(
Throwable
ex
)
{
throw
new
IllegalStateException
(
"Unable to start WebSocketServerFactory"
,
ex
);
}
}
...
...
@@ -80,29 +80,25 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Life
public
void
stop
()
{
synchronized
(
this
.
lifecycleMonitor
)
{
if
(
isRunning
())
{
this
.
running
=
false
;
try
{
this
.
factory
.
stop
();
}
catch
(
Exception
ex
)
{
catch
(
Throwable
ex
)
{
throw
new
IllegalStateException
(
"Failed to stop WebSocketServerFactory"
,
ex
);
}
finally
{
this
.
running
=
false
;
}
}
}
}
@Override
public
boolean
isRunning
()
{
synchronized
(
this
.
lifecycleMonitor
)
{
return
this
.
running
;
}
return
this
.
running
;
}
@Override
public
Mono
<
Void
>
upgrade
(
ServerWebExchange
exchange
,
WebSocketHandler
handler
)
{
ServerHttpRequest
request
=
exchange
.
getRequest
();
ServerHttpResponse
response
=
exchange
.
getResponse
();
JettyWebSocketHandlerAdapter
adapter
=
new
JettyWebSocketHandlerAdapter
(
request
,
response
,
handler
);
...
...
@@ -146,7 +142,7 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Life
synchronized
(
this
.
lifecycleMonitor
)
{
if
(
this
.
servletContext
==
null
)
{
this
.
servletContext
=
request
.
getServletContext
();
this
.
servletContext
.
setAttribute
(
DecoratedObjectFactory
.
ATTR
,
new
DecoratedObjectFactory
());
this
.
servletContext
.
setAttribute
(
DecoratedObjectFactory
.
ATTR
,
new
DecoratedObjectFactory
());
start
();
}
}
...
...
spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java
浏览文件 @
b366e159
...
...
@@ -65,9 +65,12 @@ import org.springframework.web.socket.server.RequestUpgradeStrategy;
*/
public
class
JettyRequestUpgradeStrategy
implements
RequestUpgradeStrategy
,
ServletContextAware
,
Lifecycle
{
private
static
final
ThreadLocal
<
WebSocketHandlerContainer
>
wsC
ontainerHolder
=
new
NamedThreadLocal
<>(
"WebSocket
Handler
Container"
);
private
static
final
ThreadLocal
<
WebSocketHandlerContainer
>
c
ontainerHolder
=
new
NamedThreadLocal
<>(
"WebSocket
Handler
Container"
);
// Configurable factory adapter due to Jetty 9.3.15+ API differences:
// using WebSocketServerFactory(ServletContext) as a version indicator
private
final
WebSocketServerFactoryAdapter
factoryAdapter
=
(
ClassUtils
.
hasConstructor
(
WebSocketServerFactory
.
class
,
ServletContext
.
class
)
?
new
ModernJettyWebSocketServerFactoryAdapter
()
:
new
LegacyJettyWebSocketServerFactoryAdapter
());
...
...
@@ -129,8 +132,8 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Serv
@Override
public
void
stop
()
{
if
(
isRunning
())
{
this
.
running
=
false
;
try
{
this
.
running
=
false
;
this
.
factoryAdapter
.
stop
();
}
catch
(
Throwable
ex
)
{
...
...
@@ -187,7 +190,7 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Serv
new
WebSocketHandlerContainer
(
handlerAdapter
,
selectedProtocol
,
selectedExtensions
);
try
{
wsC
ontainerHolder
.
set
(
container
);
c
ontainerHolder
.
set
(
container
);
this
.
factoryAdapter
.
getFactory
().
acceptWebSocket
(
servletRequest
,
servletResponse
);
}
catch
(
IOException
ex
)
{
...
...
@@ -195,7 +198,7 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Serv
"Response update failed during upgrade to WebSocket: "
+
request
.
getURI
(),
ex
);
}
finally
{
wsC
ontainerHolder
.
remove
();
c
ontainerHolder
.
remove
();
}
}
...
...
@@ -263,7 +266,7 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Serv
this
.
factory
.
setCreator
(
new
WebSocketCreator
()
{
@Override
public
Object
createWebSocket
(
ServletUpgradeRequest
request
,
ServletUpgradeResponse
response
)
{
WebSocketHandlerContainer
container
=
wsC
ontainerHolder
.
get
();
WebSocketHandlerContainer
container
=
c
ontainerHolder
.
get
();
Assert
.
state
(
container
!=
null
,
"Expected WebSocketHandlerContainer"
);
response
.
setAcceptedSubProtocol
(
container
.
getSelectedProtocol
());
response
.
setExtensions
(
container
.
getExtensionConfigs
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录