[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 3 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-apr : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 19 mins 57 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.10-201812060815/ecj-4.10.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-1.2-1.0.2/dest-20190523/lib -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.exclude=**/TestFlushableGZIPOutputStream.java -Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.ex cludePerformance=true -Deasymock.jar=/srv/gump/packages/easymock3/easymock-3.6.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-dbcp.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/ tomcat7-websocket.jar:/srv/gump/packages/eclipse/plugins/R-4.10-201812060815/ecj-4.10.jar:/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar:/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar:/srv/gump/packages/cglib/cglib-nodep-2.2.j
Re: [tomcat] 02/03: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62841 poss deadlock
2019年5月22日(水) 20:27 Mark Thomas : > On 22/05/2019 07:37, Keiichi Fujino wrote: > > > > > It seems that the recordAllActions flag is not set in the newly created > > DeltaRequest. > > I reworked the patch multiple times and forgot that for this iteration. > Thanks for catching it. I've fixed this with an additional commit. > > > There are duplicated codes in DeltaManager#requestCompleted and > > DeltaSession#getDiff. > > It may be able to call getDiff method in the > DeltaManager#requestCompleted. > > Good call. Fixed. > > > The same is true for DeltaManager#deserializeAndExecuteDeltaRequest and > > applyDiff. > > I couldn't see this. There are some similarities but don't see how this > could work. > > The unit tests passed so I plan to commit (and back-port) this unless > there are objections. > > I have no objection. Thanks. > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- Keiichi.Fujino
[tomcat] branch master updated: Code style
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new cbe9c72 Code style
cbe9c72 is described below
commit cbe9c72d78ddf450d19e7ffe846cdc328c337b0b
Author: remm
AuthorDate: Wed May 22 22:50:22 2019 +0200
Code style
There's a lot of code in common in SecureNioXChannel, so cleanup before
looking at it.
---
.../apache/tomcat/util/net/SecureNio2Channel.java | 8 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 142 +
2 files changed, 95 insertions(+), 55 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
index 61ed253..a45c9a5 100644
--- a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
+++ b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
@@ -55,22 +55,22 @@ public class SecureNio2Channel extends Nio2Channel {
// various scenarios
private static final int DEFAULT_NET_BUFFER_SIZE = 16921;
+protected final Nio2Endpoint endpoint;
+
protected ByteBuffer netInBuffer;
protected ByteBuffer netOutBuffer;
protected SSLEngine sslEngine;
-protected final Nio2Endpoint endpoint;
protected boolean sniComplete = false;
-private volatile boolean handshakeComplete;
+private volatile boolean handshakeComplete = false;
private volatile HandshakeStatus handshakeStatus; //gets set by handshake
-private volatile boolean unwrapBeforeRead = false;
-
protected boolean closed;
protected boolean closing;
+private volatile boolean unwrapBeforeRead = false;
private final CompletionHandler>
handshakeReadCompletionHandler;
private final CompletionHandler>
handshakeWriteCompletionHandler;
diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java
b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index 7458b21..6f32cf3 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -52,6 +52,8 @@ public class SecureNioChannel extends NioChannel {
// various scenarios
private static final int DEFAULT_NET_BUFFER_SIZE = 16921;
+private final NioEndpoint endpoint;
+
protected ByteBuffer netInBuffer;
protected ByteBuffer netOutBuffer;
@@ -66,7 +68,6 @@ public class SecureNioChannel extends NioChannel {
protected boolean closing = false;
protected NioSelectorPool pool;
-private final NioEndpoint endpoint;
public SecureNioChannel(SocketChannel channel, SocketBufferHandler
bufHandler,
NioSelectorPool pool, NioEndpoint endpoint) {
@@ -140,10 +141,9 @@ public class SecureNioChannel extends NioChannel {
*/
protected boolean flush(ByteBuffer buf) throws IOException {
int remaining = buf.remaining();
-if ( remaining > 0 ) {
-int written = sc.write(buf);
-return written >= remaining;
-}else {
+if (remaining > 0) {
+return (sc.write(buf) >= remaining);
+} else {
return true;
}
}
@@ -180,17 +180,18 @@ public class SecureNioChannel extends NioChannel {
}
}
-if (!flush(netOutBuffer)) return SelectionKey.OP_WRITE; //we still
have data to write
+if (!flush(netOutBuffer)) {
+return SelectionKey.OP_WRITE; //we still have data to write
+}
SSLEngineResult handshake = null;
while (!handshakeComplete) {
-switch ( handshakeStatus ) {
-case NOT_HANDSHAKING: {
+switch (handshakeStatus) {
+case NOT_HANDSHAKING:
//should never happen
throw new
IOException(sm.getString("channel.nio.ssl.notHandshaking"));
-}
-case FINISHED: {
+case FINISHED:
if (endpoint.hasNegotiableProtocols()) {
if (sslEngine instanceof SSLUtil.ProtocolInfo) {
socketWrapper.setNegotiatedProtocol(
@@ -203,9 +204,8 @@ public class SecureNioChannel extends NioChannel {
//we are complete if we have delivered the last package
handshakeComplete = !netOutBuffer.hasRemaining();
//return 0 if we are complete, otherwise we still have
data to write
-return handshakeComplete?0:SelectionKey.OP_WRITE;
-}
-case NEED_WRAP: {
+return handshakeComplete ? 0 : SelectionKey.OP_WRITE;
+case NEED_WRAP:
//perform the wrap function
try {
handshake = handshakeWrap(write);
@@ -216,8 +216,9 @@ public class SecureNioChannel e
[tomcat] branch master updated: Simplify code. Identified by Coverity Scan.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 3d996c7 Simplify code. Identified by Coverity Scan.
3d996c7 is described below
commit 3d996c769ea6fbed0f44bf5fdee8edaeaa4d3c5a
Author: Mark Thomas
AuthorDate: Wed May 22 15:34:12 2019 +0100
Simplify code. Identified by Coverity Scan.
---
java/org/apache/jasper/compiler/JspUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/compiler/JspUtil.java
b/java/org/apache/jasper/compiler/JspUtil.java
index a3411bd..96bd538 100644
--- a/java/org/apache/jasper/compiler/JspUtil.java
+++ b/java/org/apache/jasper/compiler/JspUtil.java
@@ -296,7 +296,7 @@ public class JspUtil {
c = double.class;
} else if ("void".equals(type)) {
c = void.class;
-} else if (type.indexOf('[') < 0) {
+} else {
c = loader.loadClass(type);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] 02/03: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62841 poss deadlock
On 22/05/2019 07:37, Keiichi Fujino wrote: > It seems that the recordAllActions flag is not set in the newly created > DeltaRequest. I reworked the patch multiple times and forgot that for this iteration. Thanks for catching it. I've fixed this with an additional commit. > There are duplicated codes in DeltaManager#requestCompleted and > DeltaSession#getDiff. > It may be able to call getDiff method in the DeltaManager#requestCompleted. Good call. Fixed. > The same is true for DeltaManager#deserializeAndExecuteDeltaRequest and > applyDiff. I couldn't see this. There are some similarities but don't see how this could work. The unit tests passed so I plan to commit (and back-port) this unless there are objections. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Remove another instance of extra socket close
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 80a5c0c Remove another instance of extra socket close
80a5c0c is described below
commit 80a5c0c5ae5ac23a4185b5cdea9479e40cef427d
Author: remm
AuthorDate: Wed May 22 10:05:27 2019 +0200
Remove another instance of extra socket close
---
java/org/apache/tomcat/util/net/SecureNioChannel.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java
b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index 093fd8e..7458b21 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -535,7 +535,6 @@ public class SecureNioChannel extends NioChannel {
} finally {
if (force || closed) {
closed = true;
-sc.socket().close();
sc.close();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
