Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
c57af869
J
jenkins
项目概览
LinuxSuRen
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c57af869
编写于
3月 21, 2016
作者:
S
Stephen Connolly
提交者:
Oliver Gondža
3月 30, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-33681] Plugin filters were failing to be removed and blocking restart
(cherry picked from commit
a5febd76
)
上级
d72076c4
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
13 addition
and
4 deletion
+13
-4
core/src/main/java/hudson/util/PluginServletFilter.java
core/src/main/java/hudson/util/PluginServletFilter.java
+13
-4
未找到文件。
core/src/main/java/hudson/util/PluginServletFilter.java
浏览文件 @
c57af869
...
...
@@ -25,6 +25,7 @@ package hudson.util;
import
hudson.ExtensionPoint
;
import
hudson.security.SecurityRealm
;
import
java.util.ArrayList
;
import
jenkins.model.Jenkins
;
import
javax.annotation.CheckForNull
;
...
...
@@ -148,18 +149,26 @@ public class PluginServletFilter implements Filter, ExtensionPoint {
public
static
void
cleanUp
()
{
PluginServletFilter
instance
=
getInstance
(
Jenkins
.
getInstance
().
servletContext
);
if
(
instance
!=
null
)
{
for
(
Iterator
<
Filter
>
iterator
=
instance
.
list
.
iterator
();
iterator
.
hasNext
();
)
{
Filter
f
=
iterator
.
next
();
// While we could rely on the current implementation of list being a CopyOnWriteArrayList
// safer to just take an explicit copy of the list and operate on the copy
for
(
Filter
f:
new
ArrayList
<>(
instance
.
list
))
{
instance
.
list
.
remove
(
f
);
// remove from the list even if destroy() fails as a failed destroy is still a destroy
try
{
f
.
destroy
();
}
catch
(
RuntimeException
e
)
{
LOGGER
.
log
(
Level
.
WARNING
,
"Filter "
+
f
+
" propagated an exception from its destroy method"
,
e
);
LOGGER
.
log
(
Level
.
WARNING
,
"Filter "
+
f
+
" propagated an exception from its destroy method"
,
e
);
}
catch
(
Error
e
)
{
throw
e
;
// we are not supposed to catch errors, don't log as could be an OOM
}
catch
(
Throwable
e
)
{
LOGGER
.
log
(
Level
.
SEVERE
,
"Filter "
+
f
+
" propagated an exception from its destroy method"
,
e
);
}
iterator
.
remove
();
}
// if some fool adds a filter while we are terminating, we should just log the fact
if
(!
instance
.
list
.
isEmpty
())
{
LOGGER
.
log
(
Level
.
SEVERE
,
"The following filters appear to have been added during clean up: {0}"
,
instance
.
list
);
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录