[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-nio 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-tc7.0.x-test-nio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.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 tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -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. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 38 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 -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-NIO -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160118.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/w orkspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dexecute.test.nio=true -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160118.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomca
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-apr : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -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. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 47 mins 24 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 -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-APR -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160118.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=true -Dexecute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/wo rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-native-src.tar.gz -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20160118/lib -Dexecute.test.nio=false -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160118.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace
[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 -WARNING- No directory [/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 10 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.3-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20160118/lib -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160118.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-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-master/dest-20160118/bin/openssl -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-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/jaspic-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-tr
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-bio 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-tc7.0.x-test-bio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -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. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 37 mins 17 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 -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-BIO -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160118.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=true -Dcommons-daemon.native.src.tgz=/srv/gump/public/wo rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-native-src.tar.gz -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dexecute.test.nio=false -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160118.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomca
Re: svn commit: r1725263 - in /tomcat/trunk: java/org/apache/catalina/ha/session/ java/org/apache/catalina/session/ webapps/docs/ webapps/docs/config/
2016-01-18 22:13 GMT+09:00 :
> Author: markt
> Date: Mon Jan 18 13:13:35 2016
> New Revision: 1725263
>
> URL: http://svn.apache.org/viewvc?rev=1725263&view=rev
> Log:
> Expand the session attribute filtering options
> - new option to filter based on implementation class of value
> - new option to log a warning message if an attribute is filtered out
> - always log a message at at least debug level if an attribute is filtered
> out
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
> tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
> tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
> tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
> tomcat/trunk/webapps/docs/changelog.xml
> tomcat/trunk/webapps/docs/config/cluster-manager.xml
> tomcat/trunk/webapps/docs/config/manager.xml
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1725263&r1=1725262&r2=1725263&view=diff
>
> ==
> ---
> tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
> (original)
> +++
> tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Mon
> Jan 18 13:13:35 2016
> @@ -314,6 +314,14 @@
>name="sessionAttributeNameFilter"
>descritpion="The string pattern used for including session
> attributes in replication. Null means all attributes are included."
>type="java.lang.String"/>
> + + name="sessionAttributeValueClassNameFilter"
> + description="The regular expression used to filter session
> attributes based on the implementation class of the value. The regular
> expression is anchored and must match the fully qualified class name."
> + type="java.lang.String"/>
> + + name="warnOnSessionAttributeFilterFailure"
> + description="Should a WARN level log message be generated if a
> session attribute fails to match sessionAttributeNameFilter or
> sessionAttributeClassNameFilter?"
> + type="boolean"/>
> name="expireSession"
>description="Expired the given session"
> @@ -536,6 +544,14 @@
>name="sessionAttributeNameFilter"
>descritpion="The string pattern used for including session
> attributes in replication. Null means all attributes are included."
>type="java.lang.String"/>
> + + name="sessionAttributeValueClassNameFilter"
> + description="The regular expression used to filter session
> attributes based on the implementation class of the value. The regular
> expression is anchored and must match the fully qualified class name."
> + type="java.lang.String"/>
> + + name="warnOnSessionAttributeFilterFailure"
> + description="Should a WARN level log message be generated if a
> session attribute fails to match sessionAttributeNameFilter or
> sessionAttributeClassNameFilter?"
> + type="boolean"/>
> name="expireSession"
>description="Expired the given session"
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=1725263&r1=1725262&r2=1725263&view=diff
>
> ==
> --- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
> Mon Jan 18 13:13:35 2016
> @@ -32,6 +32,8 @@ JDBCStore.missingDataSourceName=No valid
> JDBCStore.commitSQLException=SQLException committing connection before
> closing
> managerBase.container.noop=Managers added to containers other than
> Contexts will never be used
> managerBase.createSession.ise=createSession: Too many active sessions
> +managerBase.sessionAttributeNameFilter=Skipped session attribute named
> [{0}] because it did not match the name filter [{1}]
> +managerBase.sessionAttributeValueClassNameFilter=Skipped session
> attribute named [{0}] because the value type [{1}] did not match the filter
> [{2}]
> managerBase.sessionTimeout=Invalid session timeout setting {0}
> standardManager.loading=Loading persisted sessions from {0}
> standardManager.loading.exception=Exception while loading persisted
> sessions
>
> Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1725263&r1=1725262&r2=1725263&view=diff
>
> ==
> --- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Mon Jan
>
svn commit: r1725405 - /tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Author: kfujino Date: Tue Jan 19 02:23:38 2016 New Revision: 1725405 URL: http://svn.apache.org/viewvc?rev=1725405&view=rev Log: Implement the process of setting sessionAttributeNameFilter, sessionAttributeValueClassNameFilter and warnOnSessionAttributeFilterFailure in ClusterManagerBase.clone. Modified: tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java Modified: tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1725405&r1=1725404&r2=1725405&view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java Tue Jan 19 02:23:38 2016 @@ -193,6 +193,9 @@ public abstract class ClusterManagerBase copy.setProcessExpiresFrequency(getProcessExpiresFrequency()); copy.setNotifyListenersOnReplication(isNotifyListenersOnReplication()); copy.setSessionAttributeFilter(getSessionAttributeFilter()); +copy.setSessionAttributeNameFilter(getSessionAttributeNameFilter()); + copy.setSessionAttributeValueClassNameFilter(getSessionAttributeValueClassNameFilter()); + copy.setWarnOnSessionAttributeFilterFailure(getWarnOnSessionAttributeFilterFailure()); copy.setSecureRandomClass(getSecureRandomClass()); copy.setSecureRandomProvider(getSecureRandomProvider()); copy.setSecureRandomAlgorithm(getSecureRandomAlgorithm()); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725404 - /tomcat/native/trunk/native/src/ssl.c
Author: billbarker Date: Tue Jan 19 02:20:00 2016 New Revision: 1725404 URL: http://svn.apache.org/viewvc?rev=1725404&view=rev Log: CRYPTO_malloc_init has been renamed, not removed. Modified: tomcat/native/trunk/native/src/ssl.c Modified: tomcat/native/trunk/native/src/ssl.c URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1725404&r1=1725403&r2=1725404&view=diff == --- tomcat/native/trunk/native/src/ssl.c (original) +++ tomcat/native/trunk/native/src/ssl.c Tue Jan 19 02:20:00 2016 @@ -663,6 +663,8 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize */ #if OPENSSL_VERSION_NUMBER < 0x1010L CRYPTO_malloc_init(); +#else +OPENSSL_malloc_init(); #endif ERR_load_crypto_strings(); SSL_load_error_strings(); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725403 - /tomcat/native/branches/1.1.x/native/src/ssl.c
Author: billbarker Date: Tue Jan 19 02:17:58 2016 New Revision: 1725403 URL: http://svn.apache.org/viewvc?rev=1725403&view=rev Log: CRYPTO_malloc_init has been renamed, not removed. Modified: tomcat/native/branches/1.1.x/native/src/ssl.c Modified: tomcat/native/branches/1.1.x/native/src/ssl.c URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1725403&r1=1725402&r2=1725403&view=diff == --- tomcat/native/branches/1.1.x/native/src/ssl.c (original) +++ tomcat/native/branches/1.1.x/native/src/ssl.c Tue Jan 19 02:17:58 2016 @@ -666,6 +666,8 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize * code can successfully test the SSL environment. */ CRYPTO_malloc_init(); +#else +OPENSSL_malloc_init(); #endif ERR_load_crypto_strings(); SSL_load_error_strings(); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725393 - in /tomcat/trunk/java/org/apache/tomcat: util/digester/ util/http/ util/log/ util/net/ util/net/jsse/ util/threads/ websocket/
Author: remm
Date: Tue Jan 19 00:06:41 2016
New Revision: 1725393
URL: http://svn.apache.org/viewvc?rev=1725393&view=rev
Log:
Javadoc fixes.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreationFactory.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Rules.java
tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java
tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
tomcat/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java
tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookies.java
tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioChannel.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
tomcat/trunk/java/org/apache/tomcat/util/threads/LimitLatch.java
tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java?rev=1725393&r1=1725392&r2=1725393&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java Tue
Jan 19 00:06:41 2016
@@ -218,6 +218,7 @@ public class CallMethodRule extends Rule
/**
* Should MethodUtils.invokeExactMethod
* be used for the reflection.
+ * @return true if invokeExactMethod is used
*/
public boolean getUseExactMatch() {
return useExactMatch;
@@ -226,6 +227,7 @@ public class CallMethodRule extends Rule
/**
* Set whether MethodUtils.invokeExactMethod
* should be used for the reflection.
+ * @param useExactMatch The flag value
*/
public void setUseExactMatch(boolean useExactMatch)
{
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1725393&r1=1725392&r2=1725393&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Tue Jan 19
00:06:41 2016
@@ -297,6 +297,7 @@ public class Digester extends DefaultHan
* go dynamically as the document is parsed.
*
* @param prefix Prefix to look up
+ * @return the namespace URI
*/
public String findNamespaceURI(String prefix) {
@@ -322,6 +323,7 @@ public class Digester extends DefaultHan
* useContextClassLoader property is set to true
* The class loader used to load the Digester class itself.
*
+ * @return the classloader
*/
public ClassLoader getClassLoader() {
@@ -355,7 +357,7 @@ public class Digester extends DefaultHan
/**
- * Return the current depth of the element stack.
+ * @return the current depth of the element stack.
*/
public int getCount() {
@@ -365,7 +367,7 @@ public class Digester extends DefaultHan
/**
- * Return the name of the XML element that is currently being processed.
+ * @return the name of the XML element that is currently being processed.
*/
public String getCurrentElementName() {
@@ -380,7 +382,7 @@ public class Digester extends DefaultHan
/**
- * Return the error handler for this Digester.
+ * @return the error handler for this Digester.
*/
public ErrorHandler getErrorHandler() {
@@ -402,10 +404,11 @@ public class Digester extends DefaultHan
/**
- * Return the SAXParserFactory we will use, creating one if necessary.
- * @throws ParserConfigurationException
- * @throws SAXNotSupportedException
- * @throws SAXNotRecognizedException
+ * SAX parser factory method.
+ * @return the SAXParserFactory we will use, creating one if necessary.
+ * @throws ParserConfigurationException Error creating parser
+ * @throws SAXNotSupportedException Error creating parser
+ * @throws SAXNotRecognizedException Error
svn commit: r1725384 - /tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
Author: remm
Date: Mon Jan 18 23:08:31 2016
New Revision: 1725384
URL: http://svn.apache.org/viewvc?rev=1725384&view=rev
Log:
Space.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java?rev=1725384&r1=1725383&r2=1725384&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
Mon Jan 18 23:08:31 2016
@@ -161,7 +161,7 @@ public class SecurityCollection implemen
/**
* Set if this constraint was defined in a deployment descriptor.
- * @param isFromDescriptor true was declared in a descriptor
+ * @param isFromDescriptor true was declared in a descriptor
*/
public void setFromDescriptor(boolean isFromDescriptor) {
this.isFromDescriptor = isFromDescriptor;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725382 - /tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/
Author: remm
Date: Mon Jan 18 23:07:45 2016
New Revision: 1725382
URL: http://svn.apache.org/viewvc?rev=1725382&view=rev
Log:
Javadoc fixes.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextHandler.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextService.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ServletDef.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextHandler.java?rev=1725382&r1=1725381&r2=1725382&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextHandler.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextHandler.java
Mon Jan 18 23:07:45 2016
@@ -73,6 +73,8 @@ public class ContextHandler extends Reso
/**
* Set a configured property.
+ * @param name The property name
+ * @param value The property value
*/
public void setProperty(String name, String value) {
this.setProperty(name, (Object) value);
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextService.java?rev=1725382&r1=1725381&r2=1725382&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextService.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextService.java
Mon Jan 18 23:07:45 2016
@@ -165,7 +165,7 @@ public class ContextService extends Reso
* Declares a client dependency on the container to resolving a Service
Endpoint Interface
* to a WSDL port. It optionally associates the Service Endpoint Interface
with a
* particular port-component.
- *
+ * @return the endpoint names
*/
public Iterator getServiceendpoints() {
return this.listProperties();
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java?rev=1725382&r1=1725381&r2=1725382&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java
Mon Jan 18 23:07:45 2016
@@ -42,7 +42,8 @@ public class ContextTransaction implemen
private final HashMap properties = new HashMap<>();
/**
- * Return a configured property.
+ * @param name The property name
+ * @return a configured property.
*/
public Object getProperty(String name) {
return properties.get(name);
@@ -50,13 +51,16 @@ public class ContextTransaction implemen
/**
* Set a configured property.
+ * @param name The property name
+ * @param value The property value
*/
public void setProperty(String name, Object value) {
properties.put(name, value);
}
/**
- * remove a configured property.
+ * Remove a configured property.
+ * @param name The property name
*/
public void removeProperty(String name) {
properties.remove(name);
@@ -64,6 +68,7 @@ public class ContextTransaction implemen
/**
* List properties.
+ * @return the property names iterator
*/
public Iterator listProperties() {
return properties.keySet().iterator();
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java?rev=1725382&r1=1725381&r2=1725382&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java Mon
Jan 18 23:07:45 2016
@@ -57,7 +57,7 @@ public class ErrorPage implements Serial
/**
- * Return the error code.
[Bug 58505] getParameter but null
https://bz.apache.org/bugzilla/show_bug.cgi?id=58505 Chuck Caldarale changed: What|Removed |Added Resolution|MOVED |INVALID -- 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
[Bug 58505] getParameter but null
https://bz.apache.org/bugzilla/show_bug.cgi?id=58505 ArLi Weng changed: What|Removed |Added Resolution|INVALID |MOVED --- Comment #6 from ArLi Weng --- (In reply to Konstantin Kolinko from comment #5) > > maxPostSize="0" /> > > The above setting is invalid. Its interpretation was changed in 7.0.63 (see > the changelog). thank u for reply.. sorry for delay, i have confirm is maxPostSize problem, resoleved when i change to 10485760. ps:i forget tell multipart mode on that test sample. -- 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: r1725316 - in /tomcat/trunk/java/org/apache/tomcat/util: ./ buf/ descriptor/
Author: remm
Date: Mon Jan 18 18:20:50 2016
New Revision: 1725316
URL: http://svn.apache.org/viewvc?rev=1725316&view=rev
Log:
Javadoc fixes.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=1725316&r1=1725315&r2=1725316&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java Mon Jan 18
18:20:50 2016
@@ -38,6 +38,10 @@ public final class IntrospectionUtils {
* Find a method with the right name If found, call the method ( if param
is
* int or boolean we'll convert value to the right type before) - that
means
* you can have setDebug(1).
+ * @param o The object to set a property on
+ * @param name The property name
+ * @param value The property value
+ * @return true if operation was successful
*/
public static boolean setProperty(Object o, String name, String value) {
return setProperty(o,name,value,true);
@@ -224,7 +228,11 @@ public final class IntrospectionUtils {
}
/**
- * Replace ${NAME} with the property value
+ * Replace ${NAME} with the property value.
+ * @param value The value
+ * @param staticProp Replacement properties
+ * @param dynamicProp Replacement properties
+ * @return the replacement value
*/
public static String replaceProperties(String value,
Hashtable staticProp, PropertySource dynamicProp[])
{
@@ -278,7 +286,9 @@ public final class IntrospectionUtils {
}
/**
- * Reverse of Introspector.decapitalize
+ * Reverse of Introspector.decapitalize.
+ * @param name The name
+ * @return the capitalized string
*/
public static String capitalize(String name) {
if (name == null || name.length() == 0) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java?rev=1725316&r1=1725315&r2=1725316&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java Mon Jan 18 18:20:50
2016
@@ -56,14 +56,16 @@ public final class Ascii {
/**
* Returns the lower case equivalent of the specified ASCII character.
+ * @param c The char
+ * @return the lower case equivalent char
*/
-
public static int toLower(int c) {
return toLower[c & 0xff] & 0xff;
}
/**
- * Returns true if the specified ASCII character is a digit.
+ * @return true if the specified ASCII character is a digit.
+ * @param c The char
*/
private static boolean isDigit(int c) {
return isDigit[c & 0xff];
@@ -74,6 +76,7 @@ public final class Ascii {
* @param b the bytes to parse
* @param off the start offset of the bytes
* @param len the length of the bytes
+ * @return the long value
* @exception NumberFormatException if the long format was invalid
*/
public static long parseLong(byte[] b, int off, int len)
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1725316&r1=1725315&r2=1725316&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Mon Jan 18
18:20:50 2016
@@ -194,21 +194,21 @@ public final class ByteChunk implements
}
/**
- * Returns the message bytes.
+ * @return the message bytes.
*/
public byte[] getBytes() {
return getBuffer();
}
/**
- * Returns the message bytes.
+ * @return the message bytes.
*/
public byte[] getBuffer() {
return buff;
}
/**
- * Returns the start offset of the bytes.
+ * @return the start offset of the bytes.
* For output this is the end of the buffer.
*/
public int getStart() {
@
[Bug 58721] Http11Nio2Protocol is leaking open file handles for TCP connections
https://bz.apache.org/bugzilla/show_bug.cgi?id=58721 Remy Maucherat changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #3 from Remy Maucherat --- This sound like fairly generic use where a server processes requests. What we need is some kind of scenario that would lead to a socket (or file ?) not being closed. If I use NIO2 SSL and do some requests, I fail to see any resource leaks. -- 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
[Bug 58646] NullPointerException in InternalNioOutputBuffer
https://bz.apache.org/bugzilla/show_bug.cgi?id=58646
Mark Thomas changed:
What|Removed |Added
Status|NEW |NEEDINFO
--- Comment #17 from Mark Thomas ---
Thanks for the additional information. It is certainly more information of the
right type but it isn't (yet) enough to figure out what is going on.
I think whatever is going wrong, has already gone wrong by the time the log
messages provided in comment #15 are reached. What might provide further
insight is including the log messages for at least one whole (correctly
processed) request prior to the point where things went wrong for each of the
threads involved and the processor involved.
In terms of what might be going wrong, one possibility is that a Processor is
getting added more than once to the recycled processor pool. I can'tsee how
that might happen but adding logging in
AbstractProtocol.RecycledProcessors.push() inside the if (offer) { ... } block
might provide an idea of if something is going wrong there.
--
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: r1725299 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/AbstractHttp11Protocol.java
Author: markt
Date: Mon Jan 18 16:07:08 2016
New Revision: 1725299
URL: http://svn.apache.org/viewvc?rev=1725299&view=rev
Log:
Minor clean-up. Remove an unnecessary declared exception
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1725299&r1=1725298&r2=1725299&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Jan 18
16:07:08 2016
@@ -16,7 +16,6 @@
*/
package org.apache.coyote;
-import java.io.IOException;
import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.util.Collections;
@@ -434,7 +433,7 @@ public abstract class AbstractProtocol socket, ByteBuffer leftoverInput,
-UpgradeToken upgradeToken) throws IOException;
+UpgradeToken upgradeToken);
// - JMX related
methods
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1725299&r1=1725298&r2=1725299&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Mon Jan 18
16:07:08 2016
@@ -16,7 +16,6 @@
*/
package org.apache.coyote.ajp;
-import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.coyote.AbstractProtocol;
@@ -172,8 +171,8 @@ public abstract class AbstractAjpProtoco
@Override
protected Processor createUpgradeProcessor(SocketWrapperBase socket,
-ByteBuffer leftoverInput, UpgradeToken upgradeToken) throws
IOException {
-throw new IOException(sm.getString("ajpprotocol.noUpgradeHandler",
+ByteBuffer leftoverInput, UpgradeToken upgradeToken) {
+throw new
IllegalStateException(sm.getString("ajpprotocol.noUpgradeHandler",
upgradeToken.getHttpUpgradeHandler().getClass().getName()));
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1725299&r1=1725298&r2=1725299&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Mon
Jan 18 16:07:08 2016
@@ -16,7 +16,6 @@
*/
package org.apache.coyote.http11;
-import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
@@ -645,8 +644,7 @@ public abstract class AbstractHttp11Prot
@Override
protected Processor createUpgradeProcessor(
SocketWrapperBase socket, ByteBuffer leftoverInput,
-UpgradeToken upgradeToken)
-throws IOException {
+UpgradeToken upgradeToken) {
HttpUpgradeHandler httpUpgradeHandler =
upgradeToken.getHttpUpgradeHandler();
if (httpUpgradeHandler instanceof InternalHttpUpgradeHandler) {
return new UpgradeProcessorInternal(socket, leftoverInput,
upgradeToken);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58721] Http11Nio2Protocol is leaking open file handles for TCP connections
https://bz.apache.org/bugzilla/show_bug.cgi?id=58721 Greg Lindholm changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #2 from Greg Lindholm --- Some additional information: When I switch to Http11Nio2Protocol the problem only occurred on a service that was not behind a load balancer. We are running on AWS and most of the services are behind load balancers. For these services all of the requests are coming from the 2 IP addresses of the 2 machines that form the load balancer. The service that had the problem was not behind a load balancer and was receiving requests from thousands of external addresses. What additional information would be helpful? The problem is reproduce-able, if I switch it back to Http11Nio2Protocol then the open file list starts growing within a couple hours. The service gets several thousand requests per day. -- 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: r1725285 - in /tomcat/site/trunk: docs/presentations.html xdocs/presentations.xml
Author: markt Date: Mon Jan 18 15:16:49 2016 New Revision: 1725285 URL: http://svn.apache.org/viewvc?rev=1725285&view=rev Log: Add links to invitations Modified: tomcat/site/trunk/docs/presentations.html tomcat/site/trunk/xdocs/presentations.xml Modified: tomcat/site/trunk/docs/presentations.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1725285&r1=1725284&r2=1725285&view=diff == --- tomcat/site/trunk/docs/presentations.html (original) +++ tomcat/site/trunk/docs/presentations.html Mon Jan 18 15:16:49 2016 @@ -222,9 +222,13 @@ presentations then please do let us know -Webinar: Tuesday 26 January 2016 10.00 UTC +Webinar: Tuesday 26 January 2016 + http://markmail.org/message/phsjlphqissybr5z";>10.00 UTC + -Webinar: Tuesday 26 January 2016 20.00 UTC +Webinar: Tuesday 26 January 2016 + http://markmail.org/message/aae3xq5hfiwk6soj";>21.00 UTC + Modified: tomcat/site/trunk/xdocs/presentations.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1725285&r1=1725284&r2=1725285&view=diff == --- tomcat/site/trunk/xdocs/presentations.xml (original) +++ tomcat/site/trunk/xdocs/presentations.xml Mon Jan 18 15:16:49 2016 @@ -18,8 +18,10 @@ presentations then please do let us know TLS key/certificate generation (markt) - Webinar: Tuesday 26 January 2016 10.00 UTC - Webinar: Tuesday 26 January 2016 20.00 UTC + Webinar: Tuesday 26 January 2016 + http://markmail.org/message/phsjlphqissybr5z";>10.00 UTC + Webinar: Tuesday 26 January 2016 + http://markmail.org/message/aae3xq5hfiwk6soj";>21.00 UTC - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725284 - in /tomcat/site/trunk: docs/presentations.html xdocs/presentations.xml
Author: markt Date: Mon Jan 18 15:06:41 2016 New Revision: 1725284 URL: http://svn.apache.org/viewvc?rev=1725284&view=rev Log: Bump WebEx back another week (I have an appointment I can't move) Modified: tomcat/site/trunk/docs/presentations.html tomcat/site/trunk/xdocs/presentations.xml Modified: tomcat/site/trunk/docs/presentations.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1725284&r1=1725283&r2=1725284&view=diff == --- tomcat/site/trunk/docs/presentations.html (original) +++ tomcat/site/trunk/docs/presentations.html Mon Jan 18 15:06:41 2016 @@ -222,9 +222,9 @@ presentations then please do let us know -Webinar: Tuesday 19 January 2016 10.00 UTC +Webinar: Tuesday 26 January 2016 10.00 UTC -Webinar: Tuesday 19 January 2016 20.00 UTC +Webinar: Tuesday 26 January 2016 20.00 UTC Modified: tomcat/site/trunk/xdocs/presentations.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1725284&r1=1725283&r2=1725284&view=diff == --- tomcat/site/trunk/xdocs/presentations.xml (original) +++ tomcat/site/trunk/xdocs/presentations.xml Mon Jan 18 15:06:41 2016 @@ -18,8 +18,8 @@ presentations then please do let us know TLS key/certificate generation (markt) - Webinar: Tuesday 19 January 2016 10.00 UTC - Webinar: Tuesday 19 January 2016 20.00 UTC + Webinar: Tuesday 26 January 2016 10.00 UTC + Webinar: Tuesday 26 January 2016 20.00 UTC - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725283 - /tomcat/trunk/java/org/apache/tomcat/jni/
Author: remm
Date: Mon Jan 18 15:03:55 2016
New Revision: 1725283
URL: http://svn.apache.org/viewvc?rev=1725283&view=rev
Log:
Javadoc fixes.
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/Address.java
tomcat/trunk/java/org/apache/tomcat/jni/Buffer.java
tomcat/trunk/java/org/apache/tomcat/jni/Directory.java
tomcat/trunk/java/org/apache/tomcat/jni/File.java
tomcat/trunk/java/org/apache/tomcat/jni/Global.java
tomcat/trunk/java/org/apache/tomcat/jni/Local.java
tomcat/trunk/java/org/apache/tomcat/jni/Lock.java
tomcat/trunk/java/org/apache/tomcat/jni/Mmap.java
tomcat/trunk/java/org/apache/tomcat/jni/Multicast.java
tomcat/trunk/java/org/apache/tomcat/jni/OS.java
tomcat/trunk/java/org/apache/tomcat/jni/Poll.java
tomcat/trunk/java/org/apache/tomcat/jni/Pool.java
tomcat/trunk/java/org/apache/tomcat/jni/Proc.java
tomcat/trunk/java/org/apache/tomcat/jni/Procattr.java
tomcat/trunk/java/org/apache/tomcat/jni/Registry.java
tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
tomcat/trunk/java/org/apache/tomcat/jni/SSLSocket.java
tomcat/trunk/java/org/apache/tomcat/jni/Shm.java
tomcat/trunk/java/org/apache/tomcat/jni/Socket.java
tomcat/trunk/java/org/apache/tomcat/jni/Status.java
tomcat/trunk/java/org/apache/tomcat/jni/Stdlib.java
tomcat/trunk/java/org/apache/tomcat/jni/Thread.java
tomcat/trunk/java/org/apache/tomcat/jni/Time.java
tomcat/trunk/java/org/apache/tomcat/jni/User.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Address.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Address.java?rev=1725283&r1=1725282&r2=1725283&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Address.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Address.java Mon Jan 18 15:03:55
2016
@@ -28,12 +28,14 @@ public class Address {
* Fill the Sockaddr class from apr_sockaddr_t
* @param info Sockaddr class to fill
* @param sa Structure pointer
+ * @return true if the operation was successful
*/
public static native boolean fill(Sockaddr info, long sa);
/**
* Create the Sockaddr object from apr_sockaddr_t
* @param sa Structure pointer
+ * @return the socket address
*/
public static native Sockaddr getInfo(long sa);
@@ -59,6 +61,7 @@ public class Address {
*
* @param p The pool for the apr_sockaddr_t and associated storage.
* @return The new apr_sockaddr_t.
+ * @throws Exception Operation failed
*/
public static native long info(String hostname, int family,
int port, int flags, long p)
@@ -93,6 +96,7 @@ public class Address {
* @param which Which interface do we want the apr_sockaddr_t for?
* @param sock The socket to use
* @return The returned apr_sockaddr_t.
+ * @throws Exception An error occurred
*/
public static native long get(int which, long sock)
throws Exception;
@@ -104,8 +108,7 @@ public class Address {
*
* @param a One of the APR socket addresses.
* @param b The other APR socket address.
- * The return value will be True if the addresses
- * are equivalent.
+ * @return true if the addresses are equal
*/
public static native boolean equal(long a, long b);
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Buffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Buffer.java?rev=1725283&r1=1725282&r2=1725283&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Buffer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Buffer.java Mon Jan 18 15:03:55 2016
@@ -77,12 +77,14 @@ public class Buffer {
/**
* Returns the memory address of the ByteBuffer.
* @param buf Previously allocated ByteBuffer.
+ * @return the memory address
*/
public static native long address(ByteBuffer buf);
/**
* Returns the allocated memory size of the ByteBuffer.
* @param buf Previously allocated ByteBuffer.
+ * @return the size
*/
public static native long size(ByteBuffer buf);
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Directory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Directory.java?rev=1725283&r1=1725282&r2=1725283&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Directory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Directory.java Mon Jan 18 15:03:55
2016
@@ -28,15 +28,18 @@ public class Directory {
* @param path the path for the directory to be created. (use / on all
systems)
* @param perm Permissions for the new directo
svn commit: r1725282 - in /tomcat/trunk: java/org/apache/catalina/session/StandardSession.java webapps/docs/config/manager.xml
Author: remm
Date: Mon Jan 18 15:03:37 2016
New Revision: 1725282
URL: http://svn.apache.org/viewvc?rev=1725282&view=rev
Log:
Fix some warns.
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/webapps/docs/config/manager.xml
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1725282&r1=1725281&r2=1725282&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Mon Jan
18 15:03:37 2016
@@ -1739,7 +1739,7 @@ public class StandardSession implements
/**
* Should the given session attribute be excluded? This implementation
- * checks:
+ * checks:
*
* {@link Constants#excludedAttributeNames}
* {@link Manager#willAttributeDistribute(String, Object)}
@@ -1753,7 +1753,7 @@ public class StandardSession implements
* @param value The attribute value
*
* @return {@code true} if the attribute should be excluded from
- * distribution, otherwise {@false}
+ * distribution, otherwise {@code false}
*/
protected boolean exclude(String name, Object value) {
if (Constants.excludedAttributeNames.contains(name)) {
Modified: tomcat/trunk/webapps/docs/config/manager.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/manager.xml?rev=1725282&r1=1725281&r2=1725282&view=diff
==
--- tomcat/trunk/webapps/docs/config/manager.xml (original)
+++ tomcat/trunk/webapps/docs/config/manager.xml Mon Jan 18 15:03:37 2016
@@ -285,7 +285,7 @@
org.apache.catalina.session.StandardManager class.
-
+
A regular expression used to filter which session attributes will be
distributed. An attribute will only be distributed if its name matches
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-nio 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-tc7.0.x-test-nio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.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 tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -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. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 36 mins 50 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 -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-NIO -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160118.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/w orkspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dexecute.test.nio=true -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160118.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomca
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-apr : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -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. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 36 mins 46 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 -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-APR -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160118.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=true -Dexecute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/wo rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-native-src.tar.gz -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20160118/lib -Dexecute.test.nio=false -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160118.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace
svn commit: r1725278 - /tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Author: markt
Date: Mon Jan 18 14:12:29 2016
New Revision: 1725278
URL: http://svn.apache.org/viewvc?rev=1725278&view=rev
Log:
Trivial clean-up for clarity
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1725278&r1=1725277&r2=1725278&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Mon Jan
18 14:12:29 2016
@@ -1693,9 +1693,9 @@ public class StandardSession implements
ArrayList saveValues = new ArrayList<>();
for (int i = 0; i < keys.length; i++) {
Object value = attributes.get(keys[i]);
-if (value == null)
+if (value == null) {
continue;
-else if (isAttributeDistributable(keys[i], value) &&
!exclude(keys[i], value)) {
+} else if (isAttributeDistributable(keys[i], value) &&
!exclude(keys[i], value)) {
saveNames.add(keys[i]);
saveValues.add(value);
} else {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725275 - /tomcat/native/trunk/java/org/apache/tomcat/
Author: rjung Date: Mon Jan 18 13:59:17 2016 New Revision: 1725275 URL: http://svn.apache.org/viewvc?rev=1725275&view=rev Log: Update tcnative java external. Modified: tomcat/native/trunk/java/org/apache/tomcat/ (props changed) Propchange: tomcat/native/trunk/java/org/apache/tomcat/ -- --- svn:externals (original) +++ svn:externals Mon Jan 18 13:59:17 2016 @@ -1 +1 @@ -^/tomcat/trunk/java/org/apache/tomcat/jni@1719472 jni +^/tomcat/trunk/java/org/apache/tomcat/jni@1725266 jni - 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-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 Failed'. 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 failed -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 -WARNING- No directory [/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: 52 mins 35 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.3-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20160118/lib -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160118.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-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-master/dest-20160118/bin/openssl -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-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/jaspic-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/outpu
svn commit: r1725266 - /tomcat/trunk/webapps/docs/config/manager.xml
Author: markt Date: Mon Jan 18 13:20:44 2016 New Revision: 1725266 URL: http://svn.apache.org/viewvc?rev=1725266&view=rev Log: Make clear that the PersistenceManager is the better option is you actually *need* to persist session data across restarts. Modified: tomcat/trunk/webapps/docs/config/manager.xml Modified: tomcat/trunk/webapps/docs/config/manager.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/manager.xml?rev=1725266&r1=1725265&r2=1725266&view=diff == --- tomcat/trunk/webapps/docs/config/manager.xml (original) +++ tomcat/trunk/webapps/docs/config/manager.xml Mon Jan 18 13:20:44 2016 @@ -543,6 +543,13 @@ including theelement in your web application deployment descriptor (/WEB-INF/web.xml). +The persistence across restarts provided by the +StandardManager is a simpler implementation than that +provided by the PersistentManager. If robust, production +quality persistence across restarts is required then the +PersistentManager should be used with an appropriate +configuration. + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725264 - /tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
Author: markt
Date: Mon Jan 18 13:15:20 2016
New Revision: 1725264
URL: http://svn.apache.org/viewvc?rev=1725264&view=rev
Log:
Revert r1725201 as discussed on dev list
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1725264&r1=1725263&r2=1725264&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Mon Jan
18 13:15:20 2016
@@ -225,17 +225,11 @@ public class StandardManager extends Man
}
sessionCounter++;
}
-
+} finally {
// Delete the persistent storage file
if (file.exists()) {
file.delete();
}
-} catch (Throwable t) {
-// Clearing the partially loaded sessions here prevents the
-// stop() method overwriting the file where the session
data
-// is stored.
-sessions.clear();
-throw t;
}
}
} catch (FileNotFoundException e) {
@@ -284,8 +278,6 @@ public class StandardManager extends Man
log.debug(sm.getString("standardManager.unloading.debug"));
if (sessions.isEmpty()) {
-// This is important in the case where the load fails since it
-// prevents the overwriting of the data that failed to load.
log.debug(sm.getString("standardManager.unloading.nosessions"));
return; // nothing to do
}
@@ -362,7 +354,7 @@ public class StandardManager extends Man
load();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
-throw new
LifecycleException(sm.getString("standardManager.managerLoad"), t);
+log.error(sm.getString("standardManager.managerLoad"), t);
}
setState(LifecycleState.STARTING);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725263 - in /tomcat/trunk: java/org/apache/catalina/ha/session/ java/org/apache/catalina/session/ webapps/docs/ webapps/docs/config/
Author: markt
Date: Mon Jan 18 13:13:35 2016
New Revision: 1725263
URL: http://svn.apache.org/viewvc?rev=1725263&view=rev
Log:
Expand the session attribute filtering options
- new option to filter based on implementation class of value
- new option to log a warning message if an attribute is filtered out
- always log a message at at least debug level if an attribute is filtered out
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/cluster-manager.xml
tomcat/trunk/webapps/docs/config/manager.xml
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1725263&r1=1725262&r2=1725263&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Mon
Jan 18 13:13:35 2016
@@ -314,6 +314,14 @@
name="sessionAttributeNameFilter"
descritpion="The string pattern used for including session attributes in
replication. Null means all attributes are included."
type="java.lang.String"/>
+
+
+
+
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=1725263&r1=1725262&r2=1725263&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties Mon
Jan 18 13:13:35 2016
@@ -32,6 +32,8 @@ JDBCStore.missingDataSourceName=No valid
JDBCStore.commitSQLException=SQLException committing connection before closing
managerBase.container.noop=Managers added to containers other than Contexts
will never be used
managerBase.createSession.ise=createSession: Too many active sessions
+managerBase.sessionAttributeNameFilter=Skipped session attribute named [{0}]
because it did not match the name filter [{1}]
+managerBase.sessionAttributeValueClassNameFilter=Skipped session attribute
named [{0}] because the value type [{1}] did not match the filter [{2}]
managerBase.sessionTimeout=Invalid session timeout setting {0}
standardManager.loading=Loading persisted sessions from {0}
standardManager.loading.exception=Exception while loading persisted sessions
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1725263&r1=1725262&r2=1725263&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Mon Jan 18
13:13:35 2016
@@ -203,6 +203,10 @@ public abstract class ManagerBase extend
private Pattern sessionAttributeNamePattern;
+private Pattern sessionAttributeValueClassNamePattern;
+
+private boolean warnOnSessionAttributeFilterFailure;
+
// - Properties
@@ -257,6 +261,86 @@ public abstract class ManagerBase extend
}
+/**
+ * Obtain the regular expression used to filter session attribute based on
+ * the implementation class of the value. The regular expression is
anchored
+ * and must match the fully qualified class name.
+ *
+ * @return The regular expression currently used to filter class names.
+ * {@code null} means no filter is applied. If an empty string is
+ * specified then no names will match the filter and all attributes
+ * will be blocked.
+ */
+public String getSessionAttributeValueClassNameFilter() {
+if (sessionAttributeValueClassNamePattern == null) {
+return null;
+}
+return sessionAttributeValueClassNamePattern.toString();
+}
+
+
+/**
+ * Provides {@link #getSessionAttributeValueClassNameFilter()} as a
+ * pre-compiled regular expression pattern.
+ *
+ * @return The pre-compiled pattern used to filter session attributes based
+ * on the implementation class name of the value. {@code null}
means
+ * no filter is applied.
+ */
+protected Pattern getSessionAttributeValueClassNamePattern() {
+return sessionAttributeValueClassNamePattern;
+}
+
+
+/**
+ * Set the regular expression to use to filter classes used for session
+ * attribu
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-bio 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-tc7.0.x-test-bio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -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. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 30 mins 54 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 -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-BIO -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160118.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=true -Dcommons-daemon.native.src.tgz=/srv/gump/public/wo rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-native-src.tar.gz -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dexecute.test.nio=false -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160118.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomca
Re: svn commit: r1725201 - /tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
On 18/01/2016 12:04, Rémy Maucherat wrote: > 2016-01-18 10:17 GMT+01:00 : > >> Author: markt >> Date: Mon Jan 18 09:17:13 2016 >> New Revision: 1725201 >> >> URL: http://svn.apache.org/viewvc?rev=1725201&view=rev >> Log: >> Refactor handling of failed loading of persisted sessions. >> Old behaviour: >> - sessions loaded up to point where error occurred >> - serialized session data deleted >> - web app started >> i.e. session data after the failure was lost >> New behaviour >> - serialized session data deleted only if all sessions loaded without >> error >> - web application only starts if all sessions loaded without error >> > So I think it would be best to stat over on this. The old behavior could > perhaps be improved though, like skipping the sessions with errors but > restoring as much as possible. That, essentially, means using the PersistenceManager. > IMO this is not a real production feature at all, this is really a very old > trick. You should either use a cluster or have the session act as a read > cache (while everything is immediately persisted to the backend). Maybe > this feature could be abandoned by default actually ? [but I am worried we > could find many people relying on it ;) ] I too suspect lots of people rely on it. I'll revert this commit and update the docs to the effect that the PersistenceManager is more robust. I'm in the middle of working on a new feature in the same area of code so I'll get that completed before I revert this. Mark - 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 -WARNING- No directory [/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: 44 mins 44 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.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160118.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-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 -master/dest-20160118/bin/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-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/jaspic-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/out
svn commit: r1725249 - in /tomcat/native/branches/1.1.x: ./ native/src/lock.c
Author: rjung
Date: Mon Jan 18 12:11:27 2016
New Revision: 1725249
URL: http://svn.apache.org/viewvc?rev=1725249&view=rev
Log:
Remove unused and commented out native method
cleanup() from lock.
Backport of r1725247 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/lock.c
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 18 12:11:27 2016
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1532601,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591,1711609,1711651,1713237,1722542
+/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1532601,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591,1711609,1711651,1713237,1722542,1725247
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/src/lock.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/lock.c?rev=1725249&r1=1725248&r2=1725249&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/lock.c (original)
+++ tomcat/native/branches/1.1.x/native/src/lock.c Mon Jan 18 12:11:27 2016
@@ -86,17 +86,6 @@ TCN_IMPLEMENT_CALL(jint, Lock, destroy)(
return (jint)apr_proc_mutex_destroy(m);
}
-#if 0
-/* There is bug in APR implementing that function */
-TCN_IMPLEMENT_CALL(jint, Lock, cleanup)(TCN_STDARGS, jlong mutex)
-{
- void *m = J2P(mutex, void *);
-
-UNREFERENCED_STDARGS;
-return (jint)apr_proc_mutex_cleanup(m);
-}
-#endif
-
TCN_IMPLEMENT_CALL(jstring, Lock, lockfile)(TCN_STDARGS, jlong mutex)
{
apr_proc_mutex_t *m = J2P(mutex, apr_proc_mutex_t *);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58646] NullPointerException in InternalNioOutputBuffer
https://bz.apache.org/bugzilla/show_bug.cgi?id=58646 Alexander Malyshev changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #16 from Alexander Malyshev --- I can add more logs and reproduce again - just let me know the place to add logs. -- 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: r1725201 - /tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
2016-01-18 10:17 GMT+01:00 : > Author: markt > Date: Mon Jan 18 09:17:13 2016 > New Revision: 1725201 > > URL: http://svn.apache.org/viewvc?rev=1725201&view=rev > Log: > Refactor handling of failed loading of persisted sessions. > Old behaviour: > - sessions loaded up to point where error occurred > - serialized session data deleted > - web app started > i.e. session data after the failure was lost > New behaviour > - serialized session data deleted only if all sessions loaded without > error > - web application only starts if all sessions loaded without error > > So I think it would be best to stat over on this. The old behavior could perhaps be improved though, like skipping the sessions with errors but restoring as much as possible. IMO this is not a real production feature at all, this is really a very old trick. You should either use a cluster or have the session act as a read cache (while everything is immediately persisted to the backend). Maybe this feature could be abandoned by default actually ? [but I am worried we could find many people relying on it ;) ] Rémy
svn commit: r1725247 - /tomcat/native/trunk/native/src/lock.c
Author: rjung
Date: Mon Jan 18 12:04:00 2016
New Revision: 1725247
URL: http://svn.apache.org/viewvc?rev=1725247&view=rev
Log:
Remove unused and commented out native method
cleanup() from lock.
Modified:
tomcat/native/trunk/native/src/lock.c
Modified: tomcat/native/trunk/native/src/lock.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/lock.c?rev=1725247&r1=1725246&r2=1725247&view=diff
==
--- tomcat/native/trunk/native/src/lock.c (original)
+++ tomcat/native/trunk/native/src/lock.c Mon Jan 18 12:04:00 2016
@@ -86,17 +86,6 @@ TCN_IMPLEMENT_CALL(jint, Lock, destroy)(
return (jint)apr_proc_mutex_destroy(m);
}
-#if 0
-/* There is bug in APR implementing that function */
-TCN_IMPLEMENT_CALL(jint, Lock, cleanup)(TCN_STDARGS, jlong mutex)
-{
- void *m = J2P(mutex, void *);
-
-UNREFERENCED_STDARGS;
-return (jint)apr_proc_mutex_cleanup(m);
-}
-#endif
-
TCN_IMPLEMENT_CALL(jstring, Lock, lockfile)(TCN_STDARGS, jlong mutex)
{
apr_proc_mutex_t *m = J2P(mutex, apr_proc_mutex_t *);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725246 - /tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
Author: markt
Date: Mon Jan 18 11:56:54 2016
New Revision: 1725246
URL: http://svn.apache.org/viewvc?rev=1725246&view=rev
Log:
Improve Javadoc
Modified:
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1725246&r1=1725245&r2=1725246&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Mon Jan 18
11:56:54 2016
@@ -33,6 +33,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
@@ -205,6 +206,16 @@ public abstract class ManagerBase extend
// - Properties
+/**
+ * Obtain the regular expression used to filter session attribute based on
+ * attribute name. The regular expression is anchored so it must match the
+ * entire name
+ *
+ * @return The regular expression currently used to filter attribute names.
+ * {@code null} means no filter is applied. If an empty string is
+ * specified then no names will match the filter and all attributes
+ * will be blocked.
+ */
public String getSessionAttributeNameFilter() {
if (sessionAttributeNamePattern == null) {
return null;
@@ -213,7 +224,20 @@ public abstract class ManagerBase extend
}
-public void setSessionAttributeNameFilter(String
sessionAttributeNameFilter) {
+/**
+ * Set the regular expression to use to filter session attributes based on
+ * attribute name. The regular expression is anchored so it must match the
+ * entire name.
+ *
+ * @param sessionAttributeNameFilter The regular expression to use to
filter
+ *session attributes based on attribute name. Use {@code null} if
no
+ *filtering is required. If an empty string is specified then no
+ *names will match the filter and all attributes will be blocked.
+ *
+ * @throws PatternSyntaxException If the expression is not valid
+ */
+public void setSessionAttributeNameFilter(String
sessionAttributeNameFilter)
+throws PatternSyntaxException {
if (sessionAttributeNameFilter == null ||
sessionAttributeNameFilter.length() == 0) {
sessionAttributeNamePattern = null;
}
@@ -221,6 +245,13 @@ public abstract class ManagerBase extend
}
+/**
+ * Provides {@link #getSessionAttributeNameFilter()} as a pre-compiled
+ * regular expression pattern.
+ *
+ * @return The pre-compiled pattern used to filter session attributes based
+ * on attribute name. {@code null} means no filter is applied.
+ */
protected Pattern getSessionAttributeNamePattern() {
return sessionAttributeNamePattern;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725245 - /tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
Author: rjung
Date: Mon Jan 18 11:54:09 2016
New Revision: 1725245
URL: http://svn.apache.org/viewvc?rev=1725245&view=rev
Log:
Remove unused native method flushBIO() that has
no native implementation.
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSL.java?rev=1725245&r1=1725244&r2=1725245&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/SSL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSL.java Mon Jan 18 11:54:09 2016
@@ -486,12 +486,6 @@ public final class SSL {
public static native void freeBIO(long bio);
/**
- * BIO_flush
- * @param bio
- */
-public static native void flushBIO(long bio);
-
-/**
* SSL_shutdown
* @param ssl the SSL instance (SSL *)
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725239 - /tomcat/native/trunk/native/build/api.pl
Author: rjung Date: Mon Jan 18 11:40:15 2016 New Revision: 1725239 URL: http://svn.apache.org/viewvc?rev=1725239&view=rev Log: Also search in native/os for native implementations. Modified: tomcat/native/trunk/native/build/api.pl Modified: tomcat/native/trunk/native/build/api.pl URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/api.pl?rev=1725239&r1=1725238&r2=1725239&view=diff == --- tomcat/native/trunk/native/build/api.pl (original) +++ tomcat/native/trunk/native/build/api.pl Mon Jan 18 11:40:15 2016 @@ -47,7 +47,7 @@ our $VERSION = '1.0'; # Sub directories containing c native API and Java classes. # Path relative to tcnative main project directory. -my $C_NATIVE_SUBDIR = 'native/src'; +my $C_NATIVE_SUBDIR = 'native'; my $JAVA_API_SUBDIR = 'java'; # Macro used for marking C native API - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725237 - /tomcat/native/trunk/native/build/api.pl
Author: rjung
Date: Mon Jan 18 11:30:42 2016
New Revision: 1725237
URL: http://svn.apache.org/viewvc?rev=1725237&view=rev
Log:
Improve a bit the API consistency check script.
Modified:
tomcat/native/trunk/native/build/api.pl
Modified: tomcat/native/trunk/native/build/api.pl
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/api.pl?rev=1725237&r1=1725236&r2=1725237&view=diff
==
--- tomcat/native/trunk/native/build/api.pl (original)
+++ tomcat/native/trunk/native/build/api.pl Mon Jan 18 11:30:42 2016
@@ -237,7 +237,7 @@ sub javaNativeApi {
# Example declaration
#public static native long uid(String username, long p)
# throws Error;
-if ($_ =~ /^\s*public\s+([^\(]*)/ && ($type = $1) && $type =~
/\snative\s/) {
+if ($_ =~ /^\s*((public|protected|private)\s+)?([^\(]*)\(/ && ($type =
$3) && $type =~ /\snative\s/) {
chomp();
$signature = $_;
# Concat next line until signature is complete
@@ -252,7 +252,7 @@ sub javaNativeApi {
# Normalize return type and method name
# Remove unused specifiers
-$type =~ s/\bpublic\b//g;
+$type =~ s/\b(public|protected|private)\b//g;
$type =~ s/\bnative\b//g;
$type =~ s/\bstatic\b//g;
# Collapse multiple spaces
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1725201 - /tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
On 18/01/2016 09:24, Rémy Maucherat wrote: > 2016-01-18 10:17 GMT+01:00 : > >> Author: markt >> Date: Mon Jan 18 09:17:13 2016 >> New Revision: 1725201 >> >> URL: http://svn.apache.org/viewvc?rev=1725201&view=rev >> Log: >> Refactor handling of failed loading of persisted sessions. >> Old behaviour: >> - sessions loaded up to point where error occurred >> - serialized session data deleted >> - web app started >> i.e. session data after the failure was lost >> New behaviour >> - serialized session data deleted only if all sessions loaded without >> error >> - web application only starts if all sessions loaded without error >> > Honestly I'm not a big fan of session saving, I consider it causes as much > issues as it does resolve. But as a result, I think it should be best > effort, so I prefer the old behavior. My concern with the old behaviour was if something transient went wrong (no specific example, this has always just worked for me) then the system admin has no chance to correct it before the file is deleted. That seemed worse to me than the web application not starting. Then again, maybe the right answer is to document that this will be on a best efforts basis and if the user wants a more robust solution they should use the PersistentManager (which persists on a session by session basis so if one session fails it doesn't impact the others and the data that failed to load is retained). I do have a slight preference for this change but I am happy to revert and make the docs changes I suggest above instead if that is what people would prefer. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1724345 - /tomcat/native/branches/1.1.x/native/src/ssl.c
Some additions from the OpenSSL docs:
OPENSSL_malloc_init() sets the lower-level memory allocation functions
to their default implementation.
It is generally not necessary to call this, except perhaps in certain
shared-library situations.
and from INSTALL.W32
One final comment about compiling applications linked to the OpenSSL
library.
If you don't use the multithreaded DLL runtime library (/MD option) your
program will almost certainly crash because malloc gets confused -- the
OpenSSL DLLs are statically linked to one version, the application must
not use a different one. You might be able to work around such problems
by adding CRYPTO_malloc_init() to your program before any calls to the
OpenSSL libraries: This tells the OpenSSL libraries to use the same
malloc(), free() and realloc() as the application. However there are many
standard library functions used by OpenSSL that call malloc() internally
(e.g. fopen()), and OpenSSL cannot change these; so in general you cannot
rely on CRYPTO_malloc_init() solving your problem, and you should
consistently use the multithreaded library.
I can't currently judge myself, whether we can safely remove the call to
CRYPTO_malloc_init, but to me it looks like if it was needed before the
rename, we should keep it and rename to OPENSSL_malloc_init.
Regards,
Rainer
Am 18.01.2016 um 10:28 schrieb Rainer Jung:
Hi Bill,
According to the log message of the OpenSSL commit
bbd86bf5424a611cb6b77a3a17fc522931c4dcb8 (January 7th), we might need to
use OPENSSL_malloc_init instead:
"Rename CRYPTO_malloc_init to OPENSSL_malloc_init; remove needless calls."
I didn't look for details though.
Regards,
Rainer
Am 13.01.2016 um 03:16 schrieb billbar...@apache.org:
Author: billbarker
Date: Wed Jan 13 02:16:18 2016
New Revision: 1724345
URL: http://svn.apache.org/viewvc?rev=1724345&view=rev
Log:
It seems that CRYPTO_malloc_init has been removed from OpenSSL master,
but not yet from the header files. Waiting for next Gump run to see if
anything else is missing before porting to trunk
Modified:
tomcat/native/branches/1.1.x/native/src/ssl.c
Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1724345&r1=1724344&r2=1724345&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Wed Jan 13 02:16:18
2016
@@ -462,7 +462,7 @@ static void ssl_dyn_lock_function(int mo
else {
apr_thread_mutex_unlock(l->mutex);
}
-}
+
/*
* Dynamic lock destruction callback
@@ -661,11 +661,12 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize
ssl_initialized = 0;
return (jint)APR_EINVAL;
}
-#endif
+
/* We must register the library in full, to ensure our
configuration
* code can successfully test the SSL environment.
*/
CRYPTO_malloc_init();
+#endif
ERR_load_crypto_strings();
SSL_load_error_strings();
SSL_library_init();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request: merge lastest update
Github user markt-asf commented on the pull request: https://github.com/apache/tomcat/pull/26#issuecomment-172488725 It appears this pull request was opened in error. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request: merge lastest update
Github user markt-asf closed the pull request at: https://github.com/apache/tomcat/pull/26 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - 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-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 -WARNING- No directory [/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: 35 mins 53 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.3-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20160118/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160118.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160118-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-20160118/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-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.
[GitHub] tomcat pull request: merge lastest update
GitHub user bpzhang opened a pull request: https://github.com/apache/tomcat/pull/26 merge lastest update You can merge this pull request into a Git repository by running: $ git pull https://github.com/bpzhang/tomcat trunk Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tomcat/pull/26.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #26 commit 2df7d0acf35311fb1c358e03dba7c5b9663a6229 Author: ice Zhang Date: 2015-09-17T15:01:58Z Merge pull request #1 from apache/trunk update fork version commit 2f970cf651b1ebef21c40c162fce8b644ef75d9e Author: ice Zhang Date: 2015-10-11T01:11:40Z Merge pull request #2 from apache/trunk update my fork version commit 1bc14bf9e46eba80ba871fdec714a6a804d22e28 Author: ice Zhang Date: 2015-10-28T06:00:36Z Merge pull request #3 from apache/trunk update my fork version commit 673383a4ff185ed3e386d424ddeb15ed966a0f78 Author: ice Zhang Date: 2015-11-03T06:24:29Z Merge pull request #4 from apache/trunk update my fork version commit 6c7062da83490b58733190a4a1e4ea3d81bffae7 Author: ice Zhang Date: 2015-12-12T08:03:47Z Merge pull request #5 from apache/trunk merge lastest update --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725207 - in /tomcat/trunk: java/org/apache/catalina/ha/session/DeltaSession.java java/org/apache/catalina/session/StandardSession.java webapps/docs/changelog.xml
Author: markt
Date: Mon Jan 18 09:43:52 2016
New Revision: 1725207
URL: http://svn.apache.org/viewvc?rev=1725207&view=rev
Log:
Handle the case where the session attribute filtering configuration was changed
while the web application was stopped.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1725207&r1=1725206&r2=1725207&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Mon Jan
18 09:43:52 2016
@@ -751,6 +751,11 @@ public class DeltaSession extends Standa
}
throw wae;
}
+// Handle the case where the filter configuration was changed while
+// the web application was stopped.
+if (exclude(name, value)) {
+continue;
+}
attributes.put(name, value);
}
isValid = isValidSave;
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1725207&r1=1725206&r2=1725207&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Mon Jan
18 09:43:52 2016
@@ -1635,6 +1635,11 @@ public class StandardSession implements
if (manager.getContext().getLogger().isDebugEnabled())
manager.getContext().getLogger().debug(" loading attribute '"
+ name +
"' with value '" + value + "'");
+// Handle the case where the filter configuration was changed while
+// the web application was stopped.
+if (exclude(name, value)) {
+continue;
+}
attributes.put(name, value);
}
isValid = isValidSave;
@@ -1690,8 +1695,7 @@ public class StandardSession implements
Object value = attributes.get(keys[i]);
if (value == null)
continue;
-else if ( (value instanceof Serializable)
-&& (!exclude(keys[i]) )) {
+else if (isAttributeDistributable(keys[i], value) &&
!exclude(keys[i], value)) {
saveNames.add(keys[i]);
saveValues.add(value);
} else {
@@ -1741,8 +1745,8 @@ public class StandardSession implements
* {@link Manager#willAttributeDistribute(String, Object)}
*
* Note: This method deliberately does not check
- * {@link #isAttributeDistributable(String, Object)} which is
- * deliberately separate to support the checks required in
+ * {@link #isAttributeDistributable(String, Object)} which is kept
+ * separate to support the checks required in
* {@link #setAttribute(String, Object, boolean)}
*
* @param name The attribute name
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1725207&r1=1725206&r2=1725207&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 18 09:43:52 2016
@@ -203,7 +203,9 @@
filtered bases on attribute name to all session manager
implementations.
Note that configuration attribute name has changed from
sessionAttributeFilter to
-sessionAttributeNameFilter. (markt)
+sessionAttributeNameFilter. Apply the filter on load as
+well as unload to ensure that configuration changes made while the web
+application is stopped are applied to any persisted data. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1724345 - /tomcat/native/branches/1.1.x/native/src/ssl.c
Hi Bill,
According to the log message of the OpenSSL commit
bbd86bf5424a611cb6b77a3a17fc522931c4dcb8 (January 7th), we might need to
use OPENSSL_malloc_init instead:
"Rename CRYPTO_malloc_init to OPENSSL_malloc_init; remove needless calls."
I didn't look for details though.
Regards,
Rainer
Am 13.01.2016 um 03:16 schrieb billbar...@apache.org:
Author: billbarker
Date: Wed Jan 13 02:16:18 2016
New Revision: 1724345
URL: http://svn.apache.org/viewvc?rev=1724345&view=rev
Log:
It seems that CRYPTO_malloc_init has been removed from OpenSSL master, but not
yet from the header files. Waiting for next Gump run to see if anything else is
missing before porting to trunk
Modified:
tomcat/native/branches/1.1.x/native/src/ssl.c
Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1724345&r1=1724344&r2=1724345&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Wed Jan 13 02:16:18 2016
@@ -462,7 +462,7 @@ static void ssl_dyn_lock_function(int mo
else {
apr_thread_mutex_unlock(l->mutex);
}
-}
+
/*
* Dynamic lock destruction callback
@@ -661,11 +661,12 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize
ssl_initialized = 0;
return (jint)APR_EINVAL;
}
-#endif
+
/* We must register the library in full, to ensure our configuration
* code can successfully test the SSL environment.
*/
CRYPTO_malloc_init();
+#endif
ERR_load_crypto_strings();
SSL_load_error_strings();
SSL_library_init();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1725201 - /tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
2016-01-18 10:17 GMT+01:00 : > Author: markt > Date: Mon Jan 18 09:17:13 2016 > New Revision: 1725201 > > URL: http://svn.apache.org/viewvc?rev=1725201&view=rev > Log: > Refactor handling of failed loading of persisted sessions. > Old behaviour: > - sessions loaded up to point where error occurred > - serialized session data deleted > - web app started > i.e. session data after the failure was lost > New behaviour > - serialized session data deleted only if all sessions loaded without > error > - web application only starts if all sessions loaded without error > > Honestly I'm not a big fan of session saving, I consider it causes as much issues as it does resolve. But as a result, I think it should be best effort, so I prefer the old behavior. Rémy
svn commit: r1725204 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Mon Jan 18 09:21:00 2016 New Revision: 1725204 URL: http://svn.apache.org/viewvc?rev=1725204&view=rev Log: Update changelog Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1725204&r1=1725203&r2=1725204&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 18 09:21:00 2016 @@ -193,6 +193,18 @@ Make sure that shared Digester is reset in an unlikely error case in HostConfig.deployWAR(). (kkolinko) + +Ensure that persistent session data is not lost if an error occurs +during the loading of session data at application start. (markt) + + +Extend the feature available in the cluster session manager +implementations that enables session attribute replication to be +filtered bases on attribute name to all session manager implementations. +Note that configuration attribute name has changed from +sessionAttributeFilter to +sessionAttributeNameFilter. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725201 - /tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
Author: markt
Date: Mon Jan 18 09:17:13 2016
New Revision: 1725201
URL: http://svn.apache.org/viewvc?rev=1725201&view=rev
Log:
Refactor handling of failed loading of persisted sessions.
Old behaviour:
- sessions loaded up to point where error occurred
- serialized session data deleted
- web app started
i.e. session data after the failure was lost
New behaviour
- serialized session data deleted only if all sessions loaded without error
- web application only starts if all sessions loaded without error
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1725201&r1=1725200&r2=1725201&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Mon Jan
18 09:17:13 2016
@@ -225,11 +225,17 @@ public class StandardManager extends Man
}
sessionCounter++;
}
-} finally {
+
// Delete the persistent storage file
if (file.exists()) {
file.delete();
}
+} catch (Throwable t) {
+// Clearing the partially loaded sessions here prevents the
+// stop() method overwriting the file where the session
data
+// is stored.
+sessions.clear();
+throw t;
}
}
} catch (FileNotFoundException e) {
@@ -278,6 +284,8 @@ public class StandardManager extends Man
log.debug(sm.getString("standardManager.unloading.debug"));
if (sessions.isEmpty()) {
+// This is important in the case where the load fails since it
+// prevents the overwriting of the data that failed to load.
log.debug(sm.getString("standardManager.unloading.nosessions"));
return; // nothing to do
}
@@ -354,7 +362,7 @@ public class StandardManager extends Man
load();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
-log.error(sm.getString("standardManager.managerLoad"), t);
+throw new
LifecycleException(sm.getString("standardManager.managerLoad"), t);
}
setState(LifecycleState.STARTING);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725202 - /tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Author: markt
Date: Mon Jan 18 09:17:49 2016
New Revision: 1725202
URL: http://svn.apache.org/viewvc?rev=1725202&view=rev
Log:
clean-up
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1725202&r1=1725201&r2=1725202&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Mon Jan
18 09:17:49 2016
@@ -557,9 +557,7 @@ public class StandardSession implements
*/
@Override
public Manager getManager() {
-
-return (this.manager);
-
+return this.manager;
}
@@ -570,9 +568,7 @@ public class StandardSession implements
*/
@Override
public void setManager(Manager manager) {
-
this.manager = manager;
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725199 - /tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Author: markt Date: Mon Jan 18 09:12:28 2016 New Revision: 1725199 URL: http://svn.apache.org/viewvc?rev=1725199&view=rev Log: Improve Javadoc Modified: tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java Modified: tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1725199&r1=1725198&r2=1725199&view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java Mon Jan 18 09:12:28 2016 @@ -117,7 +117,8 @@ public abstract class ClusterManagerBase } /** - * Check whether the given session attribute should be distributed + * Check whether the given session attribute should be distributed based on + * attribute name only. * * @param name The attribute name * @return true if the attribute should be distributed - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1725183 - in /tomcat/trunk: java/org/apache/catalina/session/ManagerBase.java webapps/docs/config/cluster-manager.xml webapps/docs/config/manager.xml
Author: markt
Date: Mon Jan 18 08:19:54 2016
New Revision: 1725183
URL: http://svn.apache.org/viewvc?rev=1725183&view=rev
Log:
Prior to r1725113, a zero length string for sessionAttributeName would allow
all attributes. Restore that behaviour for the new sessionAttributeName filter.
Clarify the behaviour of the pattern matching (anchored) and the behaviour for
null and zero length strings.
Modified:
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/webapps/docs/config/cluster-manager.xml
tomcat/trunk/webapps/docs/config/manager.xml
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1725183&r1=1725182&r2=1725183&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Mon Jan 18
08:19:54 2016
@@ -214,7 +214,7 @@ public abstract class ManagerBase extend
public void setSessionAttributeNameFilter(String
sessionAttributeNameFilter) {
-if (sessionAttributeNameFilter == null) {
+if (sessionAttributeNameFilter == null ||
sessionAttributeNameFilter.length() == 0) {
sessionAttributeNamePattern = null;
}
sessionAttributeNamePattern =
Pattern.compile(sessionAttributeNameFilter);
Modified: tomcat/trunk/webapps/docs/config/cluster-manager.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-manager.xml?rev=1725183&r1=1725182&r2=1725183&view=diff
==
--- tomcat/trunk/webapps/docs/config/cluster-manager.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-manager.xml Mon Jan 18 08:19:54
2016
@@ -78,14 +78,15 @@
nodes in the cluster.
-A regular expression used to filter, which session attributes will
-be replicated. An attribute will only be replicated, if its name
-matches this pattern. If the pattern is not set (default), all
-attributes are eligible for replication. As an example, the value
-^(userName|sessionHistory)$ will only replicate the two
-session attributes named userName and
-sessionHistory. This attribute was previously called
-sessionAttributeFilter.
+A regular expression used to filter which session attributes will be
+replicated. An attribute will only be replicated if its name matches
+this pattern. If the pattern is zero length or null, all
+attributes are eligible for replication. The pattern is anchored so the
+session attribute name must fully match the pattern. As an example, the
+value (userName|sessionHistory) will only replicate the
+two session attributes named userName and
+sessionHistory. If not specified, the default value of
+null will be used.
The initial maximum time interval, in seconds,
Modified: tomcat/trunk/webapps/docs/config/manager.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/manager.xml?rev=1725183&r1=1725182&r2=1725183&view=diff
==
--- tomcat/trunk/webapps/docs/config/manager.xml (original)
+++ tomcat/trunk/webapps/docs/config/manager.xml Mon Jan 18 08:19:54 2016
@@ -167,13 +167,15 @@
-A regular expression used to filter, which session attributes will
-be distributed. An attribute will only be distributed if its name
-matches this pattern. If the pattern is not set (default), all
-attributes are eligible for replication. As an example, the value
-^(userName|sessionHistory)$ will only distribute the two
-session attributes named userName and
-sessionHistory.
+A regular expression used to filter which session attributes will be
+distributed. An attribute will only be distributed if its name matches
+this pattern. If the pattern is zero length or null, all
+attributes are eligible for distribution. The pattern is anchored so
the
+session attribute name must fully match the pattern. As an example, the
+value (userName|sessionHistory) will only distribute the
+two session attributes named userName and
+sessionHistory. If not specified, the default value of
+null will be used.
@@ -265,13 +267,15 @@
-A regular expression used to filter, which session attributes will
-be distributed. An attribute will only be distributed if its name
-matches this pattern. If the pattern is not set (default), all
-attributes are eligible for replication. As an example, the value
-^(userName|se
