Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
11b96b74
J
jenkins
项目概览
FIY695
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
11b96b74
编写于
5月 16, 2011
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
差异文件
merged back the RC branch
上级
31d36201
200bcaf2
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
33 addition
and
5 deletion
+33
-5
changelog.html
changelog.html
+4
-2
debian/debian/changelog
debian/debian/changelog
+6
-0
remoting/src/main/java/hudson/remoting/Channel.java
remoting/src/main/java/hudson/remoting/Channel.java
+11
-1
test/pom.xml
test/pom.xml
+3
-2
test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
+9
-0
未找到文件。
changelog.html
浏览文件 @
11b96b74
...
...
@@ -87,13 +87,15 @@ Upcoming changes</a>
<!-- these changes are controlled by the release process. DO NOT MODIFY -->
<div
id=
"rc"
style=
"display:none;"
>
<!--=BEGIN=-->
<h3><a
name=
v1.412
>
What's new in 1.412
</a>
<!--=DATE=-->
</h3>
<h3><a
name=
v1.413
>
What's new in 1.413
</a>
<!--=DATE=-->
</h3>
<!--=RC-CHANGES=-->
</div>
<!--=END=-->
<h3><a
name=
v1.412
>
What's new in 1.412
</a>
(2011/05/16)
</h3>
<ul
class=
image
>
<li
class=
rfe
>
Wait until updates are successfully installed before restarting Jenkins
(
<a
href=
"http://issues.jenkins-ci.org/browse/JENKINS-5047"
>
issue 5047
</a>
)
</ul>
</div>
<!--=END=-->
<h3><a
name=
v1.411
>
What's new in 1.411
</a>
(2011/05/09)
</h3>
<ul
class=
image
>
<li
class=
bug
>
...
...
debian/debian/changelog
浏览文件 @
11b96b74
jenkins (1.412) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.
-- Kohsuke Kawaguchi <kk@kohsuke.org> Mon, 16 May 2011 09:54:33 -0700
jenkins (1.411) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.
...
...
remoting/src/main/java/hudson/remoting/Channel.java
浏览文件 @
11b96b74
...
...
@@ -172,6 +172,7 @@ public class Channel implements VirtualChannel, IChannel {
*/
private
final
Vector
<
Listener
>
listeners
=
new
Vector
<
Listener
>();
private
int
gcCounter
;
private
int
commandsSent
;
/**
* Total number of nanoseconds spent for remote class loading.
...
...
@@ -485,6 +486,7 @@ public class Channel implements VirtualChannel, IChannel {
oos
.
flush
();
// make sure the command reaches the other end.
}
finally
{
Channel
.
setCurrent
(
old
);
commandsSent
++;
}
// unless this is the last command, have OOS and remote OIS forget all the objects we sent
// in this command. Otherwise it'll keep objects in memory unnecessarily.
...
...
@@ -993,15 +995,18 @@ public class Channel implements VirtualChannel, IChannel {
}
private
final
class
ReaderThread
extends
Thread
{
private
int
commandsReceived
=
0
;
private
int
commandsExecuted
=
0
;
public
ReaderThread
(
String
name
)
{
super
(
"Channel reader thread: "
+
name
);
}
@Override
public
void
run
()
{
Command
cmd
=
null
;
try
{
while
(
inClosed
==
null
)
{
Command
cmd
=
null
;
try
{
Channel
old
=
Channel
.
setCurrent
(
Channel
.
this
);
try
{
...
...
@@ -1016,7 +1021,10 @@ public class Channel implements VirtualChannel, IChannel {
throw
ioe
;
}
catch
(
ClassNotFoundException
e
)
{
logger
.
log
(
Level
.
SEVERE
,
"Unable to read a command (channel "
+
name
+
")"
,
e
);
}
finally
{
commandsReceived
++;
}
if
(
logger
.
isLoggable
(
Level
.
FINE
))
logger
.
fine
(
"Received "
+
cmd
);
try
{
...
...
@@ -1024,6 +1032,8 @@ public class Channel implements VirtualChannel, IChannel {
}
catch
(
Throwable
t
)
{
logger
.
log
(
Level
.
SEVERE
,
"Failed to execute command "
+
cmd
+
" (channel "
+
name
+
")"
,
t
);
logger
.
log
(
Level
.
SEVERE
,
"This command is created here"
,
cmd
.
createdAt
);
}
finally
{
commandsExecuted
++;
}
}
ois
.
close
();
...
...
test/pom.xml
浏览文件 @
11b96b74
...
...
@@ -53,9 +53,9 @@ THE SOFTWARE.
</plugin>
<plugin>
<!-- see http://maven-junit-plugin.kenai.com/ for more info -->
<groupId>
com.sun.maven
</groupId>
<groupId>
org.kohsuke
</groupId>
<artifactId>
maven-junit-plugin
</artifactId>
<version>
1.
8
</version>
<version>
1.
9
</version>
<executions>
<execution>
<goals>
...
...
@@ -65,6 +65,7 @@ THE SOFTWARE.
<fork>
true
</fork>
<concurrency>
${concurrency}
</concurrency>
<argLine>
-Dfile.encoding=UTF-8
</argLine>
<timeout>
300
</timeout>
<systemProperties>
<property>
<!-- use AntClassLoader that supports predictable file handle release -->
...
...
test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
浏览文件 @
11b96b74
...
...
@@ -1851,6 +1851,15 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
// DNS multicast support takes up a lot of time during tests, so just disable it altogether
// this also prevents tests from falsely advertising Hudson
DNSMultiCast
.
disabled
=
true
;
if
(!
Functions
.
isWindows
())
{
try
{
GNUCLibrary
.
LIBC
.
unsetenv
(
"MAVEN_OPTS"
);
GNUCLibrary
.
LIBC
.
unsetenv
(
"MAVEN_DEBUG_OPTS"
);
}
catch
(
Exception
e
)
{
LOGGER
.
log
(
Level
.
WARNING
,
"Failed to cancel out MAVEN_OPTS"
,
e
);
}
}
}
public
static
class
TestBuildWrapper
extends
BuildWrapper
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录