Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
27942644
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,发现更多精彩内容 >>
提交
27942644
编写于
9月 24, 2019
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix JettyRequestUpgradeStrategy initialization bug
Closes gh-23313
上级
4edc7196
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
4 addition
and
4 deletion
+4
-4
spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
...ve/socket/server/upgrade/JettyRequestUpgradeStrategy.java
+4
-4
未找到文件。
spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
浏览文件 @
27942644
...
...
@@ -95,7 +95,6 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Life
synchronized
(
this
.
lifecycleMonitor
)
{
ServletContext
servletContext
=
this
.
servletContext
;
if
(!
isRunning
()
&&
servletContext
!=
null
)
{
this
.
running
=
true
;
try
{
this
.
factory
=
(
this
.
webSocketPolicy
!=
null
?
new
WebSocketServerFactory
(
servletContext
,
this
.
webSocketPolicy
)
:
...
...
@@ -109,6 +108,7 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Life
return
container
.
getAdapter
();
});
this
.
factory
.
start
();
this
.
running
=
true
;
}
catch
(
Throwable
ex
)
{
throw
new
IllegalStateException
(
"Unable to start WebSocketServerFactory"
,
ex
);
...
...
@@ -121,10 +121,10 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Life
public
void
stop
()
{
synchronized
(
this
.
lifecycleMonitor
)
{
if
(
isRunning
())
{
this
.
running
=
false
;
if
(
this
.
factory
!=
null
)
{
try
{
this
.
factory
.
stop
();
this
.
running
=
false
;
}
catch
(
Throwable
ex
)
{
throw
new
IllegalStateException
(
"Failed to stop WebSocketServerFactory"
,
ex
);
...
...
@@ -203,11 +203,11 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Life
}
private
void
startLazily
(
HttpServletRequest
request
)
{
if
(
this
.
servletContext
!=
null
)
{
if
(
isRunning
()
)
{
return
;
}
synchronized
(
this
.
lifecycleMonitor
)
{
if
(
this
.
servletContext
==
null
)
{
if
(
!
isRunning
()
)
{
this
.
servletContext
=
request
.
getServletContext
();
start
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录