[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) 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-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Timed Out'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build timed out -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 1 hour 2 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only 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-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150226-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150226/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150226.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150226-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl/dest-20150226/bin/openssl -Dexecute.test.apr=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.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-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-spdy.jar:/s
[Bug 56026] RemoteEndpoint.Async#sendText(String, SendHandler) not thread safe
https://bz.apache.org/bugzilla/show_bug.cgi?id=56026 lijia changed: What|Removed |Added CC||walnutpri...@gmail.com -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio (in module tomcat-8.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-tc8.0.x-test-nio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 21 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 28 mins 4 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only 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-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150226-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150226.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150226-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150226/bin/op enssl -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.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-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu ild/lib/tomcat-spdy.jar
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.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-tc8.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 28 mins 28 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only 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-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150226-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150226/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150226.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150226-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150226/bin/openssl -Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.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-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.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-tc8.0.x-test-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 2 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 29 mins 27 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only 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-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150226-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150226.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150226-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150226/bin /openssl -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.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-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu ild/lib/tomc
svn commit: r1662339 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Author: remm
Date: Thu Feb 26 00:18:20 2015
New Revision: 1662339
URL: http://svn.apache.org/r1662339
Log:
Revert 1662226 and try a CI run with a simple sync (will revert after that).
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1662339&r1=1662338&r2=1662339&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Thu Feb 26 00:18:20 2015
@@ -59,7 +59,7 @@ public class WsRemoteEndpointImplServer
private volatile long timeoutExpiry = -1;
private volatile boolean close;
-private volatile boolean first = true;
+private final Object lock = new Object();
public WsRemoteEndpointImplServer(ServletInputStream sis,
ServletOutputStream sos,
WsServerContainer serverContainer) {
@@ -87,11 +87,8 @@ public class WsRemoteEndpointImplServer
public void onWritePossible(boolean useDispatch) {
-ByteBuffer[] buffers = this.buffers;
-if (first) {
-// Wait for the fist message to do something
-first = false;
-} else {
+synchronized (lock) {
+ByteBuffer[] buffers = this.buffers;
if (buffers == null) {
// Servlet 3.1 will call the write listener once even if
nothing
// was written
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662309 - /tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java
Author: fschumacher
Date: Wed Feb 25 21:19:06 2015
New Revision: 1662309
URL: http://svn.apache.org/r1662309
Log:
Correct sentence in TODO
Modified:
tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java?rev=1662309&r1=1662308&r2=1662309&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java Wed Feb
25 21:19:06 2015
@@ -121,7 +121,7 @@ public class PersistentValve extends Val
getNext().invoke(request, response);
// If still processing async, don't try to store the session
-// TODO: Are there some async states where it is would be safe to store
+// TODO: Are there some async states where it would be safe to store
// the session?
if (!request.isAsync()) {
// Read the sessionid after the response.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57637] PersistentValve always causes a new session to be created
https://bz.apache.org/bugzilla/show_bug.cgi?id=57637 --- Comment #1 from Felix Schumacher --- Fixed in trunk. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662308 - in /tomcat/trunk: java/org/apache/catalina/valves/PersistentValve.java test/org/apache/catalina/session/TestPersistentManager.java
Author: fschumacher
Date: Wed Feb 25 21:14:49 2015
New Revision: 1662308
URL: http://svn.apache.org/r1662308
Log:
Don't create a session, if none is needed when using PersistentValve.
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57637
Modified:
tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java
tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java?rev=1662308&r1=1662307&r2=1662308&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java Wed Feb
25 21:14:49 2015
@@ -128,7 +128,7 @@ public class PersistentValve extends Val
// HttpSession hsess = hreq.getSession(false);
Session hsess;
try {
-hsess = request.getSessionInternal();
+hsess = request.getSessionInternal(false);
} catch (Exception ex) {
hsess = null;
}
Modified:
tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java?rev=1662308&r1=1662307&r2=1662308&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java
Wed Feb 25 21:14:49 2015
@@ -20,13 +20,16 @@ import java.beans.PropertyChangeListener
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import org.junit.After;
import org.junit.Assert;
@@ -38,8 +41,10 @@ import org.apache.catalina.LifecycleExce
import org.apache.catalina.Manager;
import org.apache.catalina.Session;
import org.apache.catalina.Store;
+import org.apache.catalina.core.StandardContext;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.valves.PersistentValve;
public class TestPersistentManager extends TomcatBaseTest {
@@ -94,6 +99,69 @@ public class TestPersistentManager exten
}
@Test
+public void noSessionCreate_57637() throws IOException, LifecycleException
{
+
+// Setup Tomcat instance
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+StandardContext ctx = (StandardContext) tomcat.addContext("", null);
+
+Tomcat.addServlet(ctx, "DummyServlet", new DummyServlet());
+ctx.addServletMapping("/dummy", "DummyServlet");
+
+PersistentManager manager = new PersistentManager();
+DummyStore store = new DummyStore();
+
+manager.setStore(store);
+manager.setMaxIdleBackup(0);
+manager.setDistributable(true);
+ctx.setManager(manager);
+ctx.addValve(new PersistentValve());
+tomcat.start();
+Assert.assertEquals(manager.getActiveSessions(), 0);
+Assert.assertTrue("No sessions managed",
manager.getSessionIdsFull().isEmpty());
+Assert.assertEquals(
+"NO_SESSION",
+getUrl(
+"http://localhost:"; + getPort()
++ "/dummy?no_create_session=true").toString());
+Assert.assertEquals(manager.getActiveSessions(), 0);
+Assert.assertTrue("No sessions where created",
manager.getSessionIdsFull().isEmpty());
+}
+
+@Test
+public void testCreateSessionAndPassivate() throws IOException,
LifecycleException, ClassNotFoundException {
+
+// Setup Tomcat instance
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+StandardContext ctx = (StandardContext) tomcat.addContext("", null);
+
+Tomcat.addServlet(ctx, "DummyServlet", new DummyServlet());
+ctx.addServletMapping("/dummy", "DummyServlet");
+
+PersistentManager manager = new PersistentManager();
+DummyStore store = new DummyStore();
+
+manager.setStore(store);
+manager.setMaxIdleBackup(0);
+manager.setDistributable(true);
+ctx.setManager(manager);
+ctx.addValve(new PersistentValve());
+tomcat.start();
+Assert.assertEquals("No active sessions", manager.getActiveSessions(),
0);
+Assert.assertT
Re: Stabilizing the trunk (9.0.x) build
2015-02-25 19:36 GMT+01:00 Mark Thomas : > I was planning on waiting until the build was stable but given that: > - read/write concurrency is at the root of a lot of these issues > - only WebSocket should be using it now in trunk > - the plan is to refactor WebSocket to remove it > > I'm going to go back to what I have in git, rebase it to current trunk > and see where we are. If the unit tests pass on the usual platforms I'd > be tempted to commit it. WDYT? > Ok. Rémy
Re: Reg: Bug 56438
On 25/02/2015 11:46, Pravallika Peddi wrote: > Hi Mark, > > More updates on bug 56438: > > I have downloaded all the jars mentioned in the issue > except(Protomatter.jar, openspml2-toolkit.jar, ha-jdbc.jar, db2jcc4.jar, > hazelcast.jar) and added import statements in my web application for these > jars. > > I have added couple of more log messages for my research purpose in trunk > code of 8.0.x and 7.0.x and observed that, > > With 8.0.x trunk: > 1) All Jars got scanned for PLUGGABILITY and TLD's. Are you sure? Check the metadata-complete setting of the app you are using. > 2) After Pluggability scan, i do not see any log message stating "Atleast > one jar was scanned having no fragments and it is unnecessary to scan this > jar". Not sure whether it is expected or not. > > 3) For TLD scan, i could see a message stating "Atleast one jar was > scanned without TLD's. Enable debug logging provides more details on which > jars got scanned for TLDs.". When i enable "Debug" mode, i could see > messages stating "No TLDS were found in file:jar path. Consider adding this > to the tomcat.util.scan.StandardJarScanFilter.jarsToSkip property in > CATALINA_BASE/conf/catalina.properties file". > > With 7.0.x trunk: > 1) All Jars got scanned for TLDs. Seems Pluggability scan was not there(I > did not find the code for it. Correct me if i am wrong) The code is there. Look in ContextConfig. > 2) Afetr TLD scan, I do not see any message stating "No TLDs were found in > a jar" even with debug mode enabled. > > > My action items based on your confirmation: > > For 8.0.x trunk: > 1) For Pluggability scan, add code in such a way that it prints "No > Fragments were found in Jar. Hence add it under some filter in > catalina.properties file to avoid future scanning. > > 2) For TLDs: Nothing is required. > > For 7.0.x trunk: > 1) For TLD scan, add proper log message as in 8.0.x trunk for TLD not found > jars. > > Please add your suggestions. That looks like a good place to start. The tricky bit will be how you mark a JAR as 'skippable'. Mark > > Regards, > Pravallika(VIN) > > On Mon, Feb 23, 2015 at 2:46 PM, Pravallika Peddi > wrote: > >> Sure Mark. I am doing the research. >> >> On Thu, Feb 19, 2015 at 3:11 PM, Mark Thomas wrote: >> >>> On 19/02/2015 07:17, Pravallika Peddi wrote: Hi Mark, Below are my observations during my research on the bug: 1) I downloaded recent trunk and ran the ant command so that the build/bin/lib folders are generated. 2) I created a simple web application and exported to WAR file which is >>> of 3.4 MB size including 10 required jar files. 3) I enabled debugging as mentioned in bug: org.apache.tomcat.util.scan.StandardJarScanner.level = FINE org.apache.catalina.startup.Catalina.level = INFO 4) I deployed the WAR file using trunk/output/build/bin/catalina.bat >>> file. Deployment is successful and i could see my application running. One Log message observed is: 19-Feb-2015 04:30:45.958 INFO [localhost-startStop-1] org.apache.jasper.servlet.TldScanner.scanJars At least one JAR was >>> scanned for TLDs yet contained no TLDs. Enable debug logging for this logger >>> for a complete list of JARs that were scanned but no TLDs were found in them. Skipping unneeded JARs during scanning can improve startup time and JSP compilation time. 19-Feb-2015 04:30:47.144 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in 2680 ms Even though i kept 10jars only 5 jars got scanned and don't see the >>> issue reproduced. My assumptions on Bug: Deploy simple WAR taking longer time due to >>> tomcat 7.0 JAR scanning is taking more time. >>> >>> Correct. >>> Enhancement requested is: If some jar file is missing then add a log message in log file saying "add it under JarsToSkip". >>> >>> There are multiple reasons a JAR can be scanned and different properties >>> to control which scans it is included in / excluded from. >>> >>> The properties that control the scanning process changed between 7.0.x >>> and 8.0.x. 8.0.x also introduced the JarScanFilter configuration element. >>> Please correct me if my understanding about the bug is wrong. >>> >>> It isn't quite as simple as it looks. There are different views about >>> what should appear by default. I'd suggest you aim for the following >>> (some of which may already be implemented). >>> >>> 1) By default, no more than 1 log message per type of JAR scan (TLD, >>> Pluggability) per web application stating that one or more JARs were >>> scanned unnecessarily and that Tomcat could be configured to skip them >>> in future. Include details of how to get the full list of JARs if >>> required and what configuration option to change. >>> >>> 2) A simple way to enable additional logging to log each JAR and scan >>> type combination that was unnecessary. This
Re: Stabilizing the trunk (9.0.x) build
On 25/02/2015 14:31, Rémy Maucherat wrote: > 2015-02-24 16:33 GMT+01:00 Mark Thomas : > >> On 24/02/2015 13:10, Rémy Maucherat wrote: >>> I'm having issues with the write timeout tests in >>> TestWsWebSocketContainer, which made me do some changes since there are >>> still things I don't understand: >> >> These appear to be OK for me at the moment with NIO and NIO2 but the >> very nature of timing issues means that doesn't count for much. I am >> seeing failures or crashes with APR/native so there is still work to be >> done there. >> >>> - In WsRemoteEndpointImplServer, onWritePossible appears to be able to be >>> invoked concurrently (doWrite calls it directly and changes the >> buffers). I >>> think it should be synced. >> >> Those calls should be nested. If you are seeing concurrent calls then >> there is probably still an issue around write registration. >> > > I still think there is concurrency there, at least with the first write > notification (which is concurrent if the first read does write immediately, > just like our "big" failing test does). Without the read/write concurrency, > I think there wouldn't be any issue. > > With the TestWebSocketFrameClient failure, the contending traces look like > (I used a semaphore to isolate them): > [junit] java.lang.Exception: Stack trace > [junit] at java.lang.Thread.dumpStack(Thread.java:1329) > [junit] at > org.apache.tomcat.websocket.server.WsRemoteEndpointImplServer.onWritePossible(WsRemoteEndpointImplServer.java:146) > [junit] at > org.apache.tomcat.websocket.server.WsRemoteEndpointImplServer.doWrite(WsRemoteEndpointImplServer.java:87) > [junit] at > org.apache.tomcat.websocket.WsRemoteEndpointImplBase$OutputBufferSendHandler.write(WsRemoteEndpointImplBase.java:822) > [junit] at > org.apache.tomcat.websocket.WsRemoteEndpointImplBase.writeMessagePart(WsRemoteEndpointImplBase.java:447) > [junit] at > org.apache.tomcat.websocket.WsRemoteEndpointImplBase.startMessage(WsRemoteEndpointImplBase.java:338) > [junit] at > org.apache.tomcat.websocket.WsRemoteEndpointImplBase$TextMessageSendHandler.write(WsRemoteEndpointImplBase.java:730) > [junit] at > org.apache.tomcat.websocket.WsRemoteEndpointImplBase.sendPartialString(WsRemoteEndpointImplBase.java:250) > [junit] at > org.apache.tomcat.websocket.WsRemoteEndpointImplBase.sendString(WsRemoteEndpointImplBase.java:193) > [junit] at > org.apache.tomcat.websocket.WsRemoteEndpointBasic.sendText(WsRemoteEndpointBasic.java:37) > [junit] at > org.apache.tomcat.websocket.TesterFirehoseServer$Endpoint.onMessage(TesterFirehoseServer.java:121) > [junit] at sun.reflect.NativeMethodAccessorImpl.invoke0(Native > Method) > [junit] at > sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) > [junit] at > sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) > [junit] at java.lang.reflect.Method.invoke(Method.java:483) > [junit] at > org.apache.tomcat.websocket.pojo.PojoMessageHandlerWholeBase.onMessage(PojoMessageHandlerWholeBase.java:80) > [junit] at > org.apache.tomcat.websocket.WsFrameBase.sendMessageText(WsFrameBase.java:393) > [junit] at > org.apache.tomcat.websocket.WsFrameBase.processDataText(WsFrameBase.java:494) > [junit] at > org.apache.tomcat.websocket.WsFrameBase.processData(WsFrameBase.java:289) > [junit] at > org.apache.tomcat.websocket.WsFrameBase.processInputBuffer(WsFrameBase.java:130) > [junit] at > org.apache.tomcat.websocket.server.WsFrameServer.onDataAvailable(WsFrameServer.java:56) > [junit] at > org.apache.tomcat.websocket.server.WsHttpUpgradeHandler$WsReadListener.onDataAvailable(WsHttpUpgradeHandler.java:207) > [junit] at > org.apache.coyote.http11.upgrade.UpgradeServletInputStream.onDataAvailable(UpgradeServletInputStream.java:213) > [junit] at > org.apache.coyote.http11.upgrade.UpgradeProcessor.upgradeDispatch(UpgradeProcessor.java:108) > [junit] at > org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:658) > [junit] at > org.apache.coyote.http11.Http11Nio2Protocol$Http11ConnectionHandler.process(Http11Nio2Protocol.java:130) > [junit] at > org.apache.tomcat.util.net.Nio2Endpoint$SocketProcessor.doRun(Nio2Endpoint.java:1694) > [junit] at > org.apache.tomcat.util.net.Nio2Endpoint$SocketProcessor.run(Nio2Endpoint.java:1653) > [junit] at > org.apache.tomcat.util.net.Nio2Endpoint.processSocket0(Nio2Endpoint.java:578) > [junit] at > org.apache.tomcat.util.net.Nio2Endpoint.processSocket(Nio2Endpoint.java:563) > [junit] at > org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$3.completed(Nio2Endpoint.java:794) > [junit] at > org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$3.completed(Nio2Endpoint.java:775) > [junit] at sun.nio.ch.Invok
[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) 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-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Timed Out'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build timed out -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 1 hour 2 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only 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-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150225-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150225/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150225.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150225-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl/dest-20150225/bin/openssl -Dexecute.test.apr=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.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-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild
[Bug 57637] New: PersistentValve always causes a new session to be created
https://bz.apache.org/bugzilla/show_bug.cgi?id=57637 Bug ID: 57637 Summary: PersistentValve always causes a new session to be created Product: Tomcat 9 Version: unspecified Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: jboy...@apache.org When determining if a session should be persisted, PersistentValve calls getSessionInternal with no arguments which causes a new one to be allocated if none exists. It should pass false to avoid unnecessary sessions being allocated. http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java?revision=1561138&view=markup#l131 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1662226 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
2015-02-25 16:07 GMT+01:00 Felix Schumacher < felix.schumac...@internetallee.de>: > Am 25.02.2015 15:34, schrieb r...@apache.org: > +first = false; > This is not really threadsafe. What happens when more than one thread > call this method while first==false? They could (probably really really > rarely) happen to get into this if condition at the "same" time, set first > to false and do nothing. My reading would be, that this should happen only > for the first call. Maybe thread safety isn't an issue, but do we need > volatile in that case? > > If it actually fixes something, it'll be improved and then fully redone. Rémy
Re: svn commit: r1662226 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Am 25.02.2015 15:34, schrieb r...@apache.org:
Author: remm
Date: Wed Feb 25 14:34:47 2015
New Revision: 1662226
URL: http://svn.apache.org/r1662226
Log:
Add a hack to skip the initial write event since it is not really
useful for websockets. Looking at the CI history and the concurrency
results for write, the problems with TestWebSocketFrameClient may
originate from 1660609.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1662226&r1=1662225&r2=1662226&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Wed Feb 25 14:34:47 2015
@@ -59,7 +59,7 @@ public class WsRemoteEndpointImplServer
private volatile long timeoutExpiry = -1;
private volatile boolean close;
-
+private volatile boolean first = true;
public WsRemoteEndpointImplServer(ServletInputStream sis,
ServletOutputStream sos,
WsServerContainer serverContainer) {
@@ -87,51 +87,57 @@ public class WsRemoteEndpointImplServer
public void onWritePossible(boolean useDispatch) {
-if (buffers == null) {
-// Servlet 3.1 will call the write listener once even if
nothing
-// was written
-return;
-}
-boolean complete = false;
-try {
-// If this is false there will be a call back when it is
true
-while (sos.isReady()) {
-complete = true;
-for (ByteBuffer buffer : buffers) {
-if (buffer.hasRemaining()) {
-complete = false;
-sos.write(buffer.array(),
buffer.arrayOffset(),
-buffer.limit());
-buffer.position(buffer.limit());
-break;
+ByteBuffer[] buffers = this.buffers;
+if (first) {
+// Wait for the fist message to do something
fist => first
+first = false;
This is not really threadsafe. What happens when more than one thread
call this method while first==false? They could (probably really really
rarely) happen to get into this if condition at the "same" time, set
first to false and do nothing. My reading would be, that this should
happen only for the first call. Maybe thread safety isn't an issue, but
do we need volatile in that case?
+} else {
+if (buffers == null) {
+// Servlet 3.1 will call the write listener once even
if nothing
+// was written
+return;
+}
+boolean complete = false;
+try {
+// If this is false there will be a call back when it
is true
+while (sos.isReady()) {
+complete = true;
+for (ByteBuffer buffer : buffers) {
+if (buffer.hasRemaining()) {
+complete = false;
+sos.write(buffer.array(),
buffer.arrayOffset(),
+buffer.limit());
+buffer.position(buffer.limit());
+break;
+}
The switching of the variable complete from false to true to false makes
me a bit dizzy.
I would have put the for loop into a method and returned the
complete-status from there.
But this is purely cosmetic.
Regards
Felix
}
-}
-if (complete) {
-sos.flush();
-complete = sos.isReady();
if (complete) {
-wsWriteTimeout.unregister(this);
-clearHandler(null, useDispatch);
-if (close) {
-close();
+sos.flush();
+complete = sos.isReady();
+if (complete) {
+wsWriteTimeout.unregister(this);
+clearHandler(null, useDispatch);
+if (close) {
+close();
+}
}
+break;
}
-break;
}
+} catch (IOException | IllegalStateException e) {
+wsWriteTimeout.unregister(this);
+clearHandler(e, useDispatch);
+close();
}
-} catch (IOException | IllegalStateException e) {
-
[Bug 57617] File upload error reporting behaviour changed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57617 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #3 from Mark Thomas --- You need to increase maxSwallowSize to a value greater than the size of the upload. Tomcat drops the connection if more input bytes remain than maxSwallowSize. Note that as of Tomcat 7.0.60 Tomcat will read at least maxSwallowSize bytes before dropping the connection to give clients a chance to read the reponse. Note most clients don't read the response until the request has been fully written. You might want to consider using an expectation. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) 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-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 27 mins 33 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only 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-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150225-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150225.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150225-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20150225/bin/opens sl -Dexecute.test.apr=false -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.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-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-spdy.jar:/srv/gump/public/workspace/tomcat-trunk/out
svn commit: r1662229 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Wed Feb 25 14:43:19 2015 New Revision: 1662229 URL: http://svn.apache.org/r1662229 Log: Whitespace Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1662229&r1=1662228&r2=1662229&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Feb 25 14:43:19 2015 @@ -98,7 +98,7 @@ 57626: Correct a regression introduced in the 8.0.16 fix for ensuring Jars were closed after use, that broke recompilation of -modified JSPs that depended on a tag file packaged in a Jar. (markt) +modified JSPs that depended on a tag file packaged in a Jar. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662226 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Author: remm
Date: Wed Feb 25 14:34:47 2015
New Revision: 1662226
URL: http://svn.apache.org/r1662226
Log:
Add a hack to skip the initial write event since it is not really useful for
websockets. Looking at the CI history and the concurrency results for write,
the problems with TestWebSocketFrameClient may originate from 1660609.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1662226&r1=1662225&r2=1662226&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Wed Feb 25 14:34:47 2015
@@ -59,7 +59,7 @@ public class WsRemoteEndpointImplServer
private volatile long timeoutExpiry = -1;
private volatile boolean close;
-
+private volatile boolean first = true;
public WsRemoteEndpointImplServer(ServletInputStream sis,
ServletOutputStream sos,
WsServerContainer serverContainer) {
@@ -87,51 +87,57 @@ public class WsRemoteEndpointImplServer
public void onWritePossible(boolean useDispatch) {
-if (buffers == null) {
-// Servlet 3.1 will call the write listener once even if nothing
-// was written
-return;
-}
-boolean complete = false;
-try {
-// If this is false there will be a call back when it is true
-while (sos.isReady()) {
-complete = true;
-for (ByteBuffer buffer : buffers) {
-if (buffer.hasRemaining()) {
-complete = false;
-sos.write(buffer.array(), buffer.arrayOffset(),
-buffer.limit());
-buffer.position(buffer.limit());
-break;
+ByteBuffer[] buffers = this.buffers;
+if (first) {
+// Wait for the fist message to do something
+first = false;
+} else {
+if (buffers == null) {
+// Servlet 3.1 will call the write listener once even if
nothing
+// was written
+return;
+}
+boolean complete = false;
+try {
+// If this is false there will be a call back when it is true
+while (sos.isReady()) {
+complete = true;
+for (ByteBuffer buffer : buffers) {
+if (buffer.hasRemaining()) {
+complete = false;
+sos.write(buffer.array(), buffer.arrayOffset(),
+buffer.limit());
+buffer.position(buffer.limit());
+break;
+}
}
-}
-if (complete) {
-sos.flush();
-complete = sos.isReady();
if (complete) {
-wsWriteTimeout.unregister(this);
-clearHandler(null, useDispatch);
-if (close) {
-close();
+sos.flush();
+complete = sos.isReady();
+if (complete) {
+wsWriteTimeout.unregister(this);
+clearHandler(null, useDispatch);
+if (close) {
+close();
+}
}
+break;
}
-break;
}
+} catch (IOException | IllegalStateException e) {
+wsWriteTimeout.unregister(this);
+clearHandler(e, useDispatch);
+close();
}
-} catch (IOException | IllegalStateException e) {
-wsWriteTimeout.unregister(this);
-clearHandler(e, useDispatch);
-close();
-}
-if (!complete) {
-// Async write is in progress
-long timeout = getSendTimeout();
-if (timeout > 0) {
-// Register with timeout thread
-timeoutExpiry = timeout + System.currentTimeMillis();
-wsWriteTimeout.register(this);
+if (!complete) {
+// Async write is in progress
+long timeout = getSendTimeout();
+if (timeout > 0) {
+// Register with timeout thread
+timeoutExpiry = t
Re: Stabilizing the trunk (9.0.x) build
2015-02-24 16:33 GMT+01:00 Mark Thomas : > On 24/02/2015 13:10, Rémy Maucherat wrote: > > I'm having issues with the write timeout tests in > > TestWsWebSocketContainer, which made me do some changes since there are > > still things I don't understand: > > These appear to be OK for me at the moment with NIO and NIO2 but the > very nature of timing issues means that doesn't count for much. I am > seeing failures or crashes with APR/native so there is still work to be > done there. > > > - In WsRemoteEndpointImplServer, onWritePossible appears to be able to be > > invoked concurrently (doWrite calls it directly and changes the > buffers). I > > think it should be synced. > > Those calls should be nested. If you are seeing concurrent calls then > there is probably still an issue around write registration. > I still think there is concurrency there, at least with the first write notification (which is concurrent if the first read does write immediately, just like our "big" failing test does). Without the read/write concurrency, I think there wouldn't be any issue. With the TestWebSocketFrameClient failure, the contending traces look like (I used a semaphore to isolate them): [junit] java.lang.Exception: Stack trace [junit] at java.lang.Thread.dumpStack(Thread.java:1329) [junit] at org.apache.tomcat.websocket.server.WsRemoteEndpointImplServer.onWritePossible(WsRemoteEndpointImplServer.java:146) [junit] at org.apache.tomcat.websocket.server.WsRemoteEndpointImplServer.doWrite(WsRemoteEndpointImplServer.java:87) [junit] at org.apache.tomcat.websocket.WsRemoteEndpointImplBase$OutputBufferSendHandler.write(WsRemoteEndpointImplBase.java:822) [junit] at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.writeMessagePart(WsRemoteEndpointImplBase.java:447) [junit] at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.startMessage(WsRemoteEndpointImplBase.java:338) [junit] at org.apache.tomcat.websocket.WsRemoteEndpointImplBase$TextMessageSendHandler.write(WsRemoteEndpointImplBase.java:730) [junit] at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.sendPartialString(WsRemoteEndpointImplBase.java:250) [junit] at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.sendString(WsRemoteEndpointImplBase.java:193) [junit] at org.apache.tomcat.websocket.WsRemoteEndpointBasic.sendText(WsRemoteEndpointBasic.java:37) [junit] at org.apache.tomcat.websocket.TesterFirehoseServer$Endpoint.onMessage(TesterFirehoseServer.java:121) [junit] at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [junit] at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) [junit] at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) [junit] at java.lang.reflect.Method.invoke(Method.java:483) [junit] at org.apache.tomcat.websocket.pojo.PojoMessageHandlerWholeBase.onMessage(PojoMessageHandlerWholeBase.java:80) [junit] at org.apache.tomcat.websocket.WsFrameBase.sendMessageText(WsFrameBase.java:393) [junit] at org.apache.tomcat.websocket.WsFrameBase.processDataText(WsFrameBase.java:494) [junit] at org.apache.tomcat.websocket.WsFrameBase.processData(WsFrameBase.java:289) [junit] at org.apache.tomcat.websocket.WsFrameBase.processInputBuffer(WsFrameBase.java:130) [junit] at org.apache.tomcat.websocket.server.WsFrameServer.onDataAvailable(WsFrameServer.java:56) [junit] at org.apache.tomcat.websocket.server.WsHttpUpgradeHandler$WsReadListener.onDataAvailable(WsHttpUpgradeHandler.java:207) [junit] at org.apache.coyote.http11.upgrade.UpgradeServletInputStream.onDataAvailable(UpgradeServletInputStream.java:213) [junit] at org.apache.coyote.http11.upgrade.UpgradeProcessor.upgradeDispatch(UpgradeProcessor.java:108) [junit] at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:658) [junit] at org.apache.coyote.http11.Http11Nio2Protocol$Http11ConnectionHandler.process(Http11Nio2Protocol.java:130) [junit] at org.apache.tomcat.util.net.Nio2Endpoint$SocketProcessor.doRun(Nio2Endpoint.java:1694) [junit] at org.apache.tomcat.util.net.Nio2Endpoint$SocketProcessor.run(Nio2Endpoint.java:1653) [junit] at org.apache.tomcat.util.net.Nio2Endpoint.processSocket0(Nio2Endpoint.java:578) [junit] at org.apache.tomcat.util.net.Nio2Endpoint.processSocket(Nio2Endpoint.java:563) [junit] at org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$3.completed(Nio2Endpoint.java:794) [junit] at org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$3.completed(Nio2Endpoint.java:775) [junit] at sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:126) [junit] at sun.nio.ch.Invoker$2.run(Invoker.java:218) [junit] at sun.nio.ch.AsynchronousChannelGroupImpl$1.run(AsynchronousChannelGroupImpl.java:112)
svn commit: r1662221 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml
Author: markt Date: Wed Feb 25 14:20:35 2015 New Revision: 1662221 URL: http://svn.apache.org/r1662221 Log: List latest release first. Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1662221&r1=1662220&r2=1662221&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Wed Feb 25 14:20:35 2015 @@ -224,37 +224,6 @@ project logo are trademarks of the Apach - -2015-02-04 Tomcat 7.0.59 Released - - - -The Apache Tomcat Project is proud to announce the release of version 7.0.59 of -Apache Tomcat. This release contains a number of bug fixes -and improvements compared to version 7.0.57. The notable changes -since 7.0.57 include: - - - - -Session ID Generator is now extensible. - - - - -Full details of these changes, and all the other changes, are available in the -Tomcat 7 changelog. - - - - - -Download | -ChangeLog for 7.0.59 - - - - 2015-02-20 Tomcat 8.0.20 Released @@ -294,6 +263,37 @@ Full details of these changes, and all t + + +2015-02-04 Tomcat 7.0.59 Released + + + +The Apache Tomcat Project is proud to announce the release of version 7.0.59 of +Apache Tomcat. This release contains a number of bug fixes +and improvements compared to version 7.0.57. The notable changes +since 7.0.57 include: + + + + +Session ID Generator is now extensible. + + + + +Full details of these changes, and all the other changes, are available in the +Tomcat 7 changelog. + + + + + +Download | +ChangeLog for 7.0.59 + + + 2014-11-22 Tomcat 6.0.43 Released Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1662221&r1=1662220&r2=1662221&view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Wed Feb 25 14:20:35 2015 @@ -37,27 +37,6 @@ project logo are trademarks of the Apach - - -The Apache Tomcat Project is proud to announce the release of version 7.0.59 of -Apache Tomcat. This release contains a number of bug fixes -and improvements compared to version 7.0.57. The notable changes -since 7.0.57 include: - - - Session ID Generator is now extensible. - - -Full details of these changes, and all the other changes, are available in the -Tomcat 7 changelog. - - - -Download | -ChangeLog for 7.0.59 - - - The Apache Tomcat Project is proud to announce the release of version 8.0.20 @@ -86,6 +65,27 @@ Full details of these changes, and all t + + +The Apache Tomcat Project is proud to announce the release of version 7.0.59 of +Apache Tomcat. This release contains a number of bug fixes +and improvements compared to version 7.0.57. The notable changes +since 7.0.57 include: + + + Session ID Generator is now extensible. + + +Full details of these changes, and all the other changes, are available in the +Tomcat 7 changelog. + + + +Download | +ChangeLog for 7.0.59 + + + The Apache Tomcat Project is proud to announce the release of version 6.0.43 of - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662219 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Wed Feb 25 14:15:54 2015 New Revision: 1662219 URL: http://svn.apache.org/r1662219 Log: Add the release date Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1662219&r1=1662218&r2=1662219&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Feb 25 14:15:54 2015 @@ -119,7 +119,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57629] sending large file with Expect: 100-continue wrong messages order
https://bz.apache.org/bugzilla/show_bug.cgi?id=57629 --- Comment #1 from Mark Thomas --- This is only going to work if Tomcat does the authentication otherwise, as you have observed, Tomcat sends the 100 response before passing the request/response to the application for processing. One of the aims for Tomcat 9 is to implement JASPIC which would allow libraries like Spring Security to plug into Tomcat's authentication mechanism allowing for the behaviour you are looking for. The other option would be to add an option to the Context to delegate sending of the 100 response to the application. There are security concerns around expectation handling but as long as Tomcat's current handling stays in place I don't believe this would create any issues. The down side is that if the application does not send the 100 continue response then the client may wait for an unknown period of time before sending the request body any way. If you think such an option (to delegate the sending of 100 response) would be useful, we can move this issue to an enhancement. If not, it will get resolved as WONTFIX. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Reg: Bug 56438
Hi Mark, More updates on bug 56438: I have downloaded all the jars mentioned in the issue except(Protomatter.jar, openspml2-toolkit.jar, ha-jdbc.jar, db2jcc4.jar, hazelcast.jar) and added import statements in my web application for these jars. I have added couple of more log messages for my research purpose in trunk code of 8.0.x and 7.0.x and observed that, With 8.0.x trunk: 1) All Jars got scanned for PLUGGABILITY and TLD's. 2) After Pluggability scan, i do not see any log message stating "Atleast one jar was scanned having no fragments and it is unnecessary to scan this jar". Not sure whether it is expected or not. 3) For TLD scan, i could see a message stating "Atleast one jar was scanned without TLD's. Enable debug logging provides more details on which jars got scanned for TLDs.". When i enable "Debug" mode, i could see messages stating "No TLDS were found in file:jar path. Consider adding this to the tomcat.util.scan.StandardJarScanFilter.jarsToSkip property in CATALINA_BASE/conf/catalina.properties file". With 7.0.x trunk: 1) All Jars got scanned for TLDs. Seems Pluggability scan was not there(I did not find the code for it. Correct me if i am wrong) 2) Afetr TLD scan, I do not see any message stating "No TLDs were found in a jar" even with debug mode enabled. My action items based on your confirmation: For 8.0.x trunk: 1) For Pluggability scan, add code in such a way that it prints "No Fragments were found in Jar. Hence add it under some filter in catalina.properties file to avoid future scanning. 2) For TLDs: Nothing is required. For 7.0.x trunk: 1) For TLD scan, add proper log message as in 8.0.x trunk for TLD not found jars. Please add your suggestions. Regards, Pravallika(VIN) On Mon, Feb 23, 2015 at 2:46 PM, Pravallika Peddi wrote: > Sure Mark. I am doing the research. > > On Thu, Feb 19, 2015 at 3:11 PM, Mark Thomas wrote: > >> On 19/02/2015 07:17, Pravallika Peddi wrote: >> > Hi Mark, >> > Below are my observations during my research on the bug: >> > >> > 1) I downloaded recent trunk and ran the ant command so that the >> > build/bin/lib folders are generated. >> > >> > 2) I created a simple web application and exported to WAR file which is >> of >> > 3.4 MB size including 10 required jar files. >> > >> > 3) I enabled debugging as mentioned in bug: >> > org.apache.tomcat.util.scan.StandardJarScanner.level = FINE >> > org.apache.catalina.startup.Catalina.level = INFO >> > >> > 4) I deployed the WAR file using trunk/output/build/bin/catalina.bat >> file. >> > Deployment is successful and i could see my application running. >> > >> > One Log message observed is: >> > 19-Feb-2015 04:30:45.958 INFO [localhost-startStop-1] >> > org.apache.jasper.servlet.TldScanner.scanJars At least one JAR was >> scanned >> > for TLDs yet contained no TLDs. Enable debug logging for this logger >> for a >> > complete list of JARs that were scanned but no TLDs were found in them. >> > Skipping unneeded JARs during scanning can improve startup time and JSP >> > compilation time. >> > >> > 19-Feb-2015 04:30:47.144 INFO [main] >> > org.apache.catalina.startup.Catalina.start Server startup in 2680 ms >> > >> > Even though i kept 10jars only 5 jars got scanned and don't see the >> issue >> > reproduced. >> > >> > My assumptions on Bug: Deploy simple WAR taking longer time due to >> tomcat >> > 7.0 JAR scanning is taking more time. >> >> Correct. >> >> > Enhancement requested is: If some jar file is missing then add a log >> > message in log file saying "add it under JarsToSkip". >> >> There are multiple reasons a JAR can be scanned and different properties >> to control which scans it is included in / excluded from. >> >> The properties that control the scanning process changed between 7.0.x >> and 8.0.x. 8.0.x also introduced the JarScanFilter configuration element. >> >> > Please correct me if my understanding about the bug is wrong. >> >> It isn't quite as simple as it looks. There are different views about >> what should appear by default. I'd suggest you aim for the following >> (some of which may already be implemented). >> >> 1) By default, no more than 1 log message per type of JAR scan (TLD, >> Pluggability) per web application stating that one or more JARs were >> scanned unnecessarily and that Tomcat could be configured to skip them >> in future. Include details of how to get the full list of JARs if >> required and what configuration option to change. >> >> 2) A simple way to enable additional logging to log each JAR and scan >> type combination that was unnecessary. This additional logging should >> not 'hide' the JAR/scan details and in a pile of other log messages. >> >> 3) Review the list of JARs in that bug to see which ones should be added >> to which JAR scan skip option - if any - by default. >> >> The solution for trunk and 8.0.x is likely to be different than the >> solution for 7.0.x. >> >> A quick look at the code suggests that the TLD scanning is pretty much >> t
[Bug 57626] IllegalStateException: zip file closed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57626 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- Thanks for the report. This has been fixed in trunk and 8.0.x for 8.0.21 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662201 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/ java/org/apache/jasper/compiler/ test/org/apache/jasper/ test/webapp/WEB-INF/ webapps/docs/
Author: markt Date: Wed Feb 25 11:27:09 2015 New Revision: 1662201 URL: http://svn.apache.org/r1662201 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57626 Ensure that when processing a tag file within a Jar that the JspComppilationContext always has the latest, opened Jar instance to work with. Add a unit test for recompilation of a modified JSOP that depends on a tag file packaged in a Jar. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java tomcat/tc8.0.x/trunk/test/org/apache/jasper/TestJspCompilationContext.java tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/web.xml tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 25 11:27:09 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1
svn commit: r1662200 - in /tomcat/trunk: java/org/apache/jasper/JspCompilationContext.java java/org/apache/jasper/compiler/TagFileProcessor.java test/org/apache/jasper/TestJspCompilationContext.java t
Author: markt
Date: Wed Feb 25 11:23:00 2015
New Revision: 1662200
URL: http://svn.apache.org/r1662200
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57626
Ensure that when processing a tag file within a Jar that the
JspComppilationContext always has the latest, opened Jar instance to work with.
Add a unit test for recompilation of a modified JSOP that depends on a tag file
packaged in a Jar.
Modified:
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java
tomcat/trunk/test/webapp/WEB-INF/web.xml
Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1662200&r1=1662199&r2=1662200&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Wed Feb 25
11:23:00 2015
@@ -89,7 +89,7 @@ public class JspCompilationContext {
private final boolean isTagFile;
private boolean protoTypeMode;
private TagInfo tagInfo;
-private final Jar tagJar;
+private Jar tagJar;
// jspURI _must_ be relative to the context
public JspCompilationContext(String jspUri, Options options,
@@ -310,6 +310,10 @@ public class JspCompilationContext {
return this.tagJar;
}
+public void setTagFileJar(Jar tagJar) {
+this.tagJar = tagJar;
+}
+
/* Common implementation */
/**
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1662200&r1=1662199&r2=1662200&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Wed Feb
25 11:23:00 2015
@@ -554,6 +554,10 @@ class TagFileProcessor {
// time the tag file was scanned for directives, and the
tag
// file may have been modified since then.
wrapper.getJspEngineContext().setTagInfo(tagInfo);
+// The tagJar passed to to the JspCompilationContext will
+// have been closed (see the finally block at the end of
+// this method) so update the the tagJar to one opened
above
+wrapper.getJspEngineContext().setTagFileJar(tagJar);
}
Class tagClazz;
Modified: tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java?rev=1662200&r1=1662199&r2=1662200&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java Wed Feb
25 11:23:00 2015
@@ -16,6 +16,8 @@
*/
package org.apache.jasper;
+import java.io.File;
+
import javax.servlet.http.HttpServletResponse;
import org.junit.Assert;
@@ -36,6 +38,36 @@ public class TestJspCompilationContext e
"/test/jsp/tagFileInJar.jsp", body, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+Assert.assertTrue(body.toString().contains("00 - OK"));
+}
+
+
+/*
+ * Test case for https://bz.apache.org/bugzilla/show_bug.cgi?id=57626
+ */
+@Test
+public void testModifiedTagFileInJar() throws Exception {
+getTomcatInstanceTestWebapp(false, true);
+
+ByteChunk body = new ByteChunk();
+
+int rc = getUrl("http://localhost:"; + getPort() +
+"/test/jsp/tagFileInJar.jsp", body, null);
+
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+Assert.assertTrue(body.toString().contains("00 - OK"));
+
+File jsp = new File("test/webapp/jsp/tagFileInJar.jsp");
+jsp.setLastModified(jsp.lastModified() + 1);
+
+// This test requires that modificationTestInterval is set to zero in
+// web.xml. If not, a sleep longer that modificationTestInterval is
+// required here.
+
+rc = getUrl("http://localhost:"; + getPort() +
+"/test/jsp/tagFileInJar.jsp", body, null);
+
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
Assert.assertTrue(body.toString().contains("00 - OK"));
}
}
Modified: tomcat/trunk/test/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/web.xml?rev=1662200&r1=1662199&r2=1662200&view=diff
svn commit: r1662197 - /tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
Author: markt
Date: Wed Feb 25 11:04:35 2015
New Revision: 1662197
URL: http://svn.apache.org/r1662197
Log:
Small optimisation for JSP compilation on first use.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=1662197&r1=1662196&r2=1662197&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Wed Feb 25
11:04:35 2015
@@ -431,29 +431,30 @@ public abstract class Compiler {
jsw.setLastModificationTest(System.currentTimeMillis());
}
-Long jspRealLastModified = ctxt.getLastModified(ctxt.getJspFile());
-if (jspRealLastModified.longValue() < 0) {
-// Something went wrong - assume modification
-return true;
-}
-
-long targetLastModified = 0;
+// Test the target file first. Unless there is an error checking the
+// last modified time of the source (unlikely) the target is going to
+// have to be checked anyway. If the target doesn't exist (likely
during
+// startup) this saves an unnecessary check of the source.
File targetFile;
-
if (checkClass) {
targetFile = new File(ctxt.getClassFileName());
} else {
targetFile = new File(ctxt.getServletJavaFileName());
}
-
if (!targetFile.exists()) {
return true;
}
-
-targetLastModified = targetFile.lastModified();
+long targetLastModified = targetFile.lastModified();
if (checkClass && jsw != null) {
jsw.setServletClassLastModifiedTime(targetLastModified);
}
+
+Long jspRealLastModified = ctxt.getLastModified(ctxt.getJspFile());
+if (jspRealLastModified.longValue() < 0) {
+// Something went wrong - assume modification
+return true;
+}
+
if (targetLastModified != jspRealLastModified.longValue()) {
if (log.isDebugEnabled()) {
log.debug("Compiler: outdated: " + targetFile + " "
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1662014 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
2015-02-24 21:26 GMT+01:00 Christopher Schultz :
> Rémy,
>
> On 2/24/15 11:44 AM, r...@apache.org wrote:
> > Author: remm
> > Date: Tue Feb 24 16:44:05 2015
> > New Revision: 1662014
> >
> > URL: http://svn.apache.org/r1662014
> > Log:
> > Catch ISE thrown by the closed IS for a rare but possibly legitimate
> scenario.
> >
> > Modified:
> >
>
> tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
> >
> > Modified:
> tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
> > URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java?rev=1662014&r1=1662013&r2=1662014&view=diff
> >
> ==
> > ---
> tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
> (original)
> > +++
> tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
> Tue Feb 24 16:44:05 2015
> > @@ -137,7 +137,11 @@ public class WsHttpUpgradeHandler implem
> >
> wsRemoteEndpointServer.setTransformation(wsFrame.getTransformation());
> > ep.onOpen(wsSession, endpointConfig);
> > webSocketContainer.registerSession(ep, wsSession);
> > -sis.setReadListener(new WsReadListener(this, wsFrame));
> > +try {
> > +sis.setReadListener(new WsReadListener(this, wsFrame));
> > +} catch (IllegalStateException e) {
> > +// It is not impossible that the stream is already
> closed during onOpen
> > +}
>
> Do you think it would it be useful to add a trace-level log in the catch
> branch, for debugging?
>
Some user code is run before that, so a lot of things can happen and since
this code is inside the container, it looks fine to me.
Rémy
svn commit: r1662179 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationContext.java test/org/apache/catalina/core/TestApplicationContext.java webapps/docs/changelog.xml
Author: markt Date: Wed Feb 25 08:25:52 2015 New Revision: 1662179 URL: http://svn.apache.org/r1662179 Log: Relax the restriction added in r1645015. Expand the unit tests. While the Javadoc for getContext(String) could be clearer, the intended behaviour appears to mapping rather than an exact match because: - there is no way with an excat match to obtain the ROOT context - "Returns a ServletContext object that corresponds to a specified URL on the server." Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 25 08:25:52 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208,1658737,1658801-1658803,1658811,1658834,1659045,1659190-1659191,1659266,1659294,1659308,1659383,1659386,1659429,1659472,1659507,1659517,1659522,1659563,1659807 ,1659816,1659835-1659864,1659968,1660953,1660970 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1 352661,135266
svn commit: r1662178 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationContext.java test/org/apache/catalina/core/TestApplicationContext.java webapps/docs/changelog.xml
Author: markt Date: Wed Feb 25 08:20:07 2015 New Revision: 1662178 URL: http://svn.apache.org/r1662178 Log: Relax the restriction added in r1644992. Expand the unit tests. While the Javadoc for getContext(String) could be clearer, the intended behaviour appears to mapping rather than an exact match because: - there is no way with an excat match to obtain the ROOT context - "Returns a ServletContext object that corresponds to a specified URL on the server." Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 25 08:20:07 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661972,1661990 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654
