Re: [VOTE] Release Apache Tomcat 6.0.41
On 20/05/2014 00:29, Konstantin Kolinko wrote: 2014-05-19 16:58 GMT+04:00 Mark Thomas ma...@apache.org: The proposed Apache Tomcat 6.0.41 release candidate is now available for voting. The main changes since 6.0.40 are: - Fix BZ 56529 The main changes since 6.0.39 are: - Add support for using ecj-P20140317-1600.jar to use Java 8 syntax in JSPs - Update native library to 1.1.30 - Various improvements to XML processing along with a number of bug fixes. Full details are in the change log. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.41/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1014/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_41 The proposed 6.0.41 release is: [ ] Broken - do not release [x] Stable - go ahead and release as 6.0.41 Stable 1. Please upload the *.asc files. They are missing. Sorry. I forgot those need to be generated manually for 6.0.x. I've now done this and uploaded them to the right places. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r5393 - in /dev/tomcat/tomcat-6/v6.0.41: bin/ bin/extras/ src/
Author: markt Date: Tue May 20 08:46:04 2014 New Revision: 5393 Log: Add missing signature files Added: dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41-deployer.tar.gz.asc dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41-deployer.zip.asc dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41-fulldocs.tar.gz.asc dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41-windows-i64.zip.asc dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41-windows-x64.zip.asc dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41-windows-x86.zip.asc dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41.exe.asc dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41.tar.gz.asc dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41.zip.asc dev/tomcat/tomcat-6/v6.0.41/bin/extras/catalina-jmx-remote.jar.asc dev/tomcat/tomcat-6/v6.0.41/bin/extras/catalina-ws.jar.asc dev/tomcat/tomcat-6/v6.0.41/bin/extras/tomcat-juli-adapters.jar.asc dev/tomcat/tomcat-6/v6.0.41/bin/extras/tomcat-juli.jar.asc dev/tomcat/tomcat-6/v6.0.41/src/apache-tomcat-6.0.41-src.tar.gz.asc dev/tomcat/tomcat-6/v6.0.41/src/apache-tomcat-6.0.41-src.zip.asc Added: dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41-deployer.tar.gz.asc == --- dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41-deployer.tar.gz.asc (added) +++ dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41-deployer.tar.gz.asc Tue May 20 08:46:04 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJTexXJAAoJEBDAHFovYFnnZksQALzYGQZw4aJsqGue5xsxPfJ3 +ZFWhaWYfS1Aqkui4U/K4pyfTVnSQHILV/a9ChfooFQUgvHoEK7cZSwfZ+064m2Ah +3r7vFSn/zYcLF1SXOa+muate8IByBE0qg6LdmlEuerKbAp1vgdMlkW2kyZmWJj6O +k851lHHQfwDCNlE32BYdSXrtJwt1bwcMvLrz3IoZY5ICzx1jwyEzgYOSwnWizb0d +hXJ2+3b/Y9QAx31MsCDhq7fYUKsOgtXjNohFzIS4+DegxgNJj0AlmnZzlQXvwfR5 +NtHoNcBoRwEMmVTPOeQpIGBi57W4ciahdzXkeuK9smQxXuDEe3yJU2INSlpT/DIw +gUb6mIskOd1sKFrqw/aUb56KvTmzR5Zxo41LCDMlLAVx5NVR2EBDtMISwqertS0K +68garytkJLoq4DnH1Cwq/h1LLRynmzco5tjbVwjZVutsNr9P9wDVisVv02+DzU9f +BIGIY08LXB6K54vUP5ldjFlZzro9cKDVB2dMNRBPD5ZE5lsFcMHWpOTdi9i2mRxV +tBjSitVxe9wR0CAxFU/euuCXDDtDrzjmTNY7ktMxp7k3F+O6V1HJGZ5qHbusXPTE +KzfXIOaxDoasrDISTru+wqyX7AgfHZz9NglfUZimMabB98Qj2G0kVeO+Acs4G1MF +XNyG2oeY1JCjhEG4GQ1q +=xQLZ +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41-deployer.zip.asc == --- dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41-deployer.zip.asc (added) +++ dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41-deployer.zip.asc Tue May 20 08:46:04 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJTexXQAAoJEBDAHFovYFnnu3gP+weThD5eJp/qnZn+oXgjfVoP +Kezo6sNoXBfYA0oSlGTr+mNzczIMNwja6MsiUyd3AW/Vy0np8dmJGBt6sg9jg+7C +nF9jXdT0xFRjJ2X4EDIeaBZzwOlJOQ/mm76PKAOU0oNxnghFGAO10T7IVGMRfXWx +vZCSKnzCwTuHy8wOMdCZnMB3iog+F6h7VO+4MmP7ZnUEnd7E+dKHD6l8Xva5FgXF +9JrsQ6mQI3eRCs2LEm0//v/ZmWIWeStu3NCGYDHE/FzPYh6hlRwK9I5qDcX+vdCA +M7YVpcRR1zjyzmZwB+GZBdV5vkRi+Jt26i+TssOJV8+J+dwK73ca431a7M1/4FMl +rpETijfFNbfFSCdfbSKNU3KRkoSxV/N26EZlkdZfuNC8BYDNafdDZ6s8BH5k0M1A +TeXNng+40PCe1D/A9UCSIAil08ohnurDxM4heT16hPSTNeZ+/XUKMvVduQBzpE+V +lZRdaxiXjyCB11Okx39jB7T7d8YtLtPmHtQBMA8fJPs5X5vEgGXFIOiLyozaQaKI +yB5I2ACJQyKuFxTfHjWSbQGHUCZDYeV1hP4Axb3tnd3qZu+fyk6GMa0y92xymTZT +NclWpiNhHat9wIIl1HAb70VmpC6mbrdsiB3GPF9PXmfHdK7EE12TAZlqo1ctujkq +mUzqQ7zPXD4Sq4+EdEnd +=Q5ND +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41-fulldocs.tar.gz.asc == --- dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41-fulldocs.tar.gz.asc (added) +++ dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41-fulldocs.tar.gz.asc Tue May 20 08:46:04 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJTexXRAAoJEBDAHFovYFnnApQP/2XIXcz/S6g4L5SKI/5CrcxP +2g9tHPzuMct2zaErSYyXJZUB4GAuArwundIYlWNNH/em84IJJJmJNL5fYeNbvKka +/uHltBeGv8ot9QRUypehCkF0RACm6FLNLf5hzNXBKtKX6S/V7LEPP9ERXLBk6g5S +pU1pYGcDGIkiYe+JC69UJD+WgzZmh/x65FBxmVGSMLrAn3cfx1pU0HADlGaZ2Ci4 +9uR0VJNmSx4Qe+Pk6mf2zCHG+HVy/1RMFsaVJPUI13N8wytbPRYtJM0Q0qbJuxsU +R3NDv5FfjhmYAD4lbkVJIRuncNfWU/4dVmpffEDO2R+Gdu65mUaVQ/12NgZbIc/a +1lPe5PFOvGXGfrh4D1aIpGH4Ig/S1/COaBYULf0xugGmEMku+k1iiHEN1GKFEECo +QrqJrhONata1sjYfUHXe34DNs+L8bnQK5oXePx+cd8eFW1UZAMdOboe86DLmXm2X +FugTcwmdOJdDUSMbJ5CDb6bnfZAPEzYCHQHO0bAtLsNbstSgj+qkYlUHuf9Bbslv +uZQtuWeihnc1fP39ry48dGlpFzvU5ra90wehUHb2yqlm7Vpn0dAuQIURCEn1Q+QN +oLb/3fLd8rnw2XiP7NcH8XPZblhSakuqsYBZQYRWzl9a/FLOleThEfhPWHnSmwK7 +Q+XgfG+R7gC55I1J2bD8 +=gRX1 +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41-windows-i64.zip.asc == ---
svn commit: r1596141 - /tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Author: markt
Date: Tue May 20 08:49:35 2014
New Revision: 1596141
URL: http://svn.apache.org/r1596141
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56545
Pre-load an additional class if running under a security manager
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1596141r1=1596140r2=1596141view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Tue
May 20 08:49:35 2014
@@ -275,6 +275,7 @@ public final class SecurityClassLoad {
clazz.newInstance();
loader.loadClass(basePackage + util.http.HttpMessages);
loader.loadClass(basePackage + util.http.parser.HttpParser);
+loader.loadClass(basePackage +
util.http.parser.HttpParser$SkipConstantResult);
loader.loadClass(basePackage + util.http.parser.MediaType);
loader.loadClass(basePackage + util.http.parser.MediaTypeCache);
// net
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596152 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: markt
Date: Tue May 20 09:05:38 2014
New Revision: 1596152
URL: http://svn.apache.org/r1596152
Log:
FindBugs.
Remove unnecessary null check
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1596152r1=1596151r2=1596152view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue May 20
09:05:38 2014
@@ -1513,8 +1513,7 @@ public class NioEndpoint extends Abstrac
// Upgraded connections need to allow multiple threads to access
the
// connection at the same time to enable blocking IO to be used
when
// NIO has been configured
-if (ka != null ka.isUpgraded()
-SocketStatus.OPEN_WRITE == status) {
+if (ka.isUpgraded() SocketStatus.OPEN_WRITE == status) {
synchronized (ka.getWriteThreadLock()) {
doRun(key, ka);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r5397 [2/2] - in /dev/tomcat/tomcat-7/v7.0.54: ./ bin/ bin/embed/ bin/extras/ src/
Added: dev/tomcat/tomcat-7/v7.0.54/bin/extras/tomcat-juli-adapters.jar.asc == --- dev/tomcat/tomcat-7/v7.0.54/bin/extras/tomcat-juli-adapters.jar.asc (added) +++ dev/tomcat/tomcat-7/v7.0.54/bin/extras/tomcat-juli-adapters.jar.asc Tue May 20 09:31:34 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.21 (MingW32) + +iQIcBAABCgAGBQJTelxMAAoJECCLCrHWMBHHEP8QAOvv6GEZIjlyJL3SUqDjG05l +jWNkExMiBSEd6JMG5tE2Kknz/L7eUqF825ajTdJePDoG51Rj9cdkOzIN31PCnF0o +kuZFt2sQn9SO1DYTUBfZRxnA6TzfKlInt5RhXrNGlPgDf0WmVvu54G+FtO0F7y6J +K6zw7EvdQTAz6yVUscKAS7L/zkt2Bl49MBERmBfSLj8m8UgwIertJ+tHybo30qNq +ilbtR8XHbSkjE7wgDZG0wr8+kx5B/bSewOaDn6EA6iw/RmMulvhjoAHozly9aDQT +OAdhiL2nhka3lbqBpZp8Jyiq2WZT4XX6TRww1Jq5zynZ28H6ZJilynv9Dbg4/Vo2 +MLxIONjjodw/tl6z+7TrapvO8MsubNFgPfXVlm2hMuMxjLWY89WpjgtWmegxRfJP +UZ+5Eu/CnXZxqVixhmThxP4SGamyBDIoiA17DUnxITUa16UpDievMw26AJbwwgRA +AUrqS45sKFhnHvIWECcrLZd9Ni1WBGgMrqK9CdH1y4SPODTuHt8a1kv1DCzYi5pZ +ZZpqWvoQfSutXlFknx7CX52SzCPkAxEhdL6VooiWJP7xIimIMXyAIOc2Eq5ebhrz +7UuOc5sLx0ovDINAOU1K7eY8IMERU7fZWljs8Se4v5T493SnpQOYDu8KuKYUniIY +2RM4+j/mJD6J7Ea+Yth4 +=nHDQ +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.54/bin/extras/tomcat-juli-adapters.jar.md5 == --- dev/tomcat/tomcat-7/v7.0.54/bin/extras/tomcat-juli-adapters.jar.md5 (added) +++ dev/tomcat/tomcat-7/v7.0.54/bin/extras/tomcat-juli-adapters.jar.md5 Tue May 20 09:31:34 2014 @@ -0,0 +1 @@ +2833a49b59da5c7bb350624cb16d8574 *tomcat-juli-adapters.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.54/bin/extras/tomcat-juli.jar == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.54/bin/extras/tomcat-juli.jar -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-7/v7.0.54/bin/extras/tomcat-juli.jar.asc == --- dev/tomcat/tomcat-7/v7.0.54/bin/extras/tomcat-juli.jar.asc (added) +++ dev/tomcat/tomcat-7/v7.0.54/bin/extras/tomcat-juli.jar.asc Tue May 20 09:31:34 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.21 (MingW32) + +iQIcBAABCgAGBQJTelxLAAoJECCLCrHWMBHHtiAP/1+judBwoWjeOJh6iTwyg5jP +YZOBVnRcwyvVaXVRQaAPOJUUkcW8QHexXHwPFdfZ0CUzDskfTBN0MhhhiKF8HDkH ++gP3MsfWPSjX/sGAXwzd9WUaLcZ8YlAKNyV2nyw0PImYzI870p4gnlJXHMguisSl +vH5HFbNWbZS9wlokWW9Lp7maEyClcVW6tNgc68Owl5Hw6pmj07OKWUIF/rU6T8jG +bJKWWgU9P8Z4tQEi6KjNOXIL3NMlc8i4/wgTFTzhSFFGBYUjOQWm2am5nP18Ftgp +hQJxvXQSnBn8GSMnaNRyu56u2yRGijfZPFI+MtLvVKlI4Se5vukMcOkM89yNQkG6 +iiYOH+Wbn0t+QpKMZ7JD49Tm7WZQeEDaujSAnkVm8kSfYfqFJvzghUM+47/ft8Jv +ZDidyrPZ/pRDk0Q0VsFaPNukpW/lm6O/gkw4CIZ2Pl4g+bZWHBMVrydGyjzB5X30 +0Z4SeSclBUPiZPBYCnRNP0qw+xUYrBHsvRSmFyujfFaNsQYDnMwnJeXLMGfHZG7F ++qSikuRMLm1RQVq33+xbjHaTLHTN9JX10HKb0/MIy+GrytCNT4RlO0Y2c2D1aHZd +JPs92x5zpEP158xqsWM9B5dpMbDWyV4rb6MtJ0Pxhfm+WQlTU/vrQbXFhY83V28p +aQ8D49Cswtu5bmDuc1Bj +=RV0S +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.54/bin/extras/tomcat-juli.jar.md5 == --- dev/tomcat/tomcat-7/v7.0.54/bin/extras/tomcat-juli.jar.md5 (added) +++ dev/tomcat/tomcat-7/v7.0.54/bin/extras/tomcat-juli.jar.md5 Tue May 20 09:31:34 2014 @@ -0,0 +1 @@ +bb7b496e4cf9d119d441bd017debde1e *tomcat-juli.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.54/src/apache-tomcat-7.0.54-src.tar.gz == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.54/src/apache-tomcat-7.0.54-src.tar.gz -- svn:mime-type = application/x-gzip Added: dev/tomcat/tomcat-7/v7.0.54/src/apache-tomcat-7.0.54-src.tar.gz.asc == --- dev/tomcat/tomcat-7/v7.0.54/src/apache-tomcat-7.0.54-src.tar.gz.asc (added) +++ dev/tomcat/tomcat-7/v7.0.54/src/apache-tomcat-7.0.54-src.tar.gz.asc Tue May 20 09:31:34 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.21 (MingW32) + +iQIcBAABCgAGBQJTemA7AAoJECCLCrHWMBHHlEsP/1Ge2IkkjfmX7jAZ0Le+SxB/ +ujbs34sTGDA1EwbaCInxxQ95yV+z5NbSEiJNN/8v3SSugghwSy5luR8jRKkgfFuq +ACvg0AC4vErFXJoL0GeyyJgB89vvPyFlRUMBujvoRIRuXHVNVdAL3iOpMZWskJAE +Wt9Kq3jbFL1ytHcAFwZjhchzEnmFkR8iIV5lHDGeAf1u2n5YsLjBzGBDdWWeJZ1n +Qo6JuH2MnMoyR8+AwBxLjerOzbx76XvAefyaW+ZetZGwacdZ20PWEzlzHSD3HLj/ +c2JqRZJ7aT9UOkI1TpmIaWI6ouSIe9mDgDVDSQz3VE5JgZx1ebik71nmh2DRihTt +WbH88vLdYSeB4MiL8Hl8e0ddvcoK5JFdvUAv6ZE87WXo6wwxN1LH5bO0PULLgxGC +b2uDGeGbsDyV3HJzCDY5Pdkgs/S448fpxfFOjn209EW8kSVNJ4lVfPoYvigtlVX1 +ux5GeI84rEWZ6wn0h4k/Zi01gn++VMCbi0w34junww+jk1qkPArWnpk4Kio2CdcV
[VOTE] Release Apache Tomcat 7.0.54
The proposed Apache Tomcat 7.0.54 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.54/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1015/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_54/ The proposed 7.0.54 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.54 Stable Regards Violeta
svn commit: r1596176 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default
Author: violetagg Date: Tue May 20 10:07:29 2014 New Revision: 1596176 URL: http://svn.apache.org/r1596176 Log: Prep for next version Modified: tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Modified: tomcat/tc7.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1596176r1=1596175r2=1596176view=diff == --- tomcat/tc7.0.x/trunk/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/build.properties.default Tue May 20 10:07:29 2014 @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=54 +version.build=55 version.patch=0 version.suffix=-dev Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1596176r1=1596175r2=1596176view=diff == --- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Tue May 20 10:07:29 2014 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=7.0.54 +maven.asf.release.deploy.version=7.0.55 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596186 - in /tomcat/trunk/java/org/apache/naming/factory: EjbFactory.java FactoryBase.java ResourceEnvFactory.java ResourceFactory.java TransactionFactory.java
Author: markt
Date: Tue May 20 10:28:46 2014
New Revision: 1596186
URL: http://svn.apache.org/r1596186
Log:
Experiment with the Simbian duplicate code detection tool.
Remove 100+ lines of duplicate code
Added:
tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java (with props)
Modified:
tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java
tomcat/trunk/java/org/apache/naming/factory/ResourceEnvFactory.java
tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java
tomcat/trunk/java/org/apache/naming/factory/TransactionFactory.java
Modified: tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java?rev=1596186r1=1596185r2=1596186view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java Tue May 20
10:28:46 2014
@@ -16,11 +16,7 @@
*/
package org.apache.naming.factory;
-import java.util.Hashtable;
-
-import javax.naming.Context;
import javax.naming.InitialContext;
-import javax.naming.Name;
import javax.naming.NamingException;
import javax.naming.RefAddr;
import javax.naming.Reference;
@@ -33,96 +29,43 @@ import org.apache.naming.EjbRef;
*
* @author Remy Maucherat
*/
-public class EjbFactory implements ObjectFactory {
+public class EjbFactory extends FactoryBase {
+
+@Override
+protected boolean isReferenceTypeSupported(Object obj) {
+return obj instanceof EjbRef;
+}
-/**
- * Create a new EJB instance.
- *
- * @param obj The reference object describing the DataSource
- */
@Override
-public Object getObjectInstance(Object obj, Name name, Context nameCtx,
-Hashtable?,? environment)
-throws Exception {
-
-if (obj instanceof EjbRef) {
-Reference ref = (Reference) obj;
-
-// If ejb-link has been specified, resolving the link using JNDI
-RefAddr linkRefAddr = ref.get(EjbRef.LINK);
-if (linkRefAddr != null) {
-// Retrieving the EJB link
-String ejbLink = linkRefAddr.getContent().toString();
-Object beanObj = (new InitialContext()).lookup(ejbLink);
-return beanObj;
-}
-
-ObjectFactory factory = null;
-RefAddr factoryRefAddr = ref.get(Constants.FACTORY);
-if (factoryRefAddr != null) {
-// Using the specified factory
-String factoryClassName =
-factoryRefAddr.getContent().toString();
-// Loading factory
-ClassLoader tcl =
-Thread.currentThread().getContextClassLoader();
-Class? factoryClass = null;
-if (tcl != null) {
-try {
-factoryClass = tcl.loadClass(factoryClassName);
-} catch(ClassNotFoundException e) {
-NamingException ex = new NamingException
-(Could not load resource factory class);
-ex.initCause(e);
-throw ex;
-}
-} else {
-try {
-factoryClass = Class.forName(factoryClassName);
-} catch(ClassNotFoundException e) {
-NamingException ex = new NamingException
-(Could not load resource factory class);
-ex.initCause(e);
-throw ex;
-}
-}
-if (factoryClass != null) {
-try {
-factory = (ObjectFactory) factoryClass.newInstance();
-} catch(Throwable t) {
-NamingException ex = new NamingException
-(Could not load resource factory class);
-ex.initCause(t);
-throw ex;
-}
-}
-} else {
-String javaxEjbFactoryClassName =
-System.getProperty(javax.ejb.Factory,
- Constants.OPENEJB_EJB_FACTORY);
-try {
-factory = (ObjectFactory)
-Class.forName(javaxEjbFactoryClassName).newInstance();
-} catch(Throwable t) {
-if (t instanceof NamingException)
-throw (NamingException) t;
-NamingException ex = new NamingException
-(Could not create resource factory instance);
-ex.initCause(t);
-throw ex;
-}
-}
-
-
svn commit: r1596189 - /tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
Author: markt
Date: Tue May 20 10:47:55 2014
New Revision: 1596189
URL: http://svn.apache.org/r1596189
Log:
FindBugs
setup() vs setUp()
Modified:
tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
Modified:
tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java?rev=1596189r1=1596188r2=1596189view=diff
==
---
tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
Tue May 20 10:47:55 2014
@@ -38,8 +38,10 @@ public class TestStuckThreadDetectionVal
private StandardContext context;
private Tomcat tomcat;
+@Override
@Before
-public void setup() {
+public void setUp() throws Exception {
+super.setUp();
tomcat = getTomcatInstance();
File docBase = new File(System.getProperty(java.io.tmpdir));
context = (StandardContext) tomcat.addContext(,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596197 - /tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
Author: markt
Date: Tue May 20 11:12:57 2014
New Revision: 1596197
URL: http://svn.apache.org/r1596197
Log:
Fix logic error
Modified:
tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
Modified: tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java?rev=1596197r1=1596196r2=1596197view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java Tue May 20
11:12:57 2014
@@ -91,7 +91,9 @@ public abstract class FactoryBase implem
}
// Check for a default factory
-factory = getDefaultFactory(ref);
+if (factory == null) {
+factory = getDefaultFactory(ref);
+}
if (factory != null) {
return factory.getObjectInstance(obj, name, nameCtx,
environment);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596198 - /tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
Author: markt
Date: Tue May 20 11:13:52 2014
New Revision: 1596198
URL: http://svn.apache.org/r1596198
Log:
Simplify
Modified:
tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
Modified: tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java?rev=1596198r1=1596197r2=1596198view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java Tue May 20
11:13:52 2014
@@ -88,10 +88,8 @@ public abstract class FactoryBase implem
throw ex;
}
}
-}
-
-// Check for a default factory
-if (factory == null) {
+} else {
+// Check for a default factory
factory = getDefaultFactory(ref);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596201 - in /tomcat/trunk: java/org/apache/catalina/security/SecurityClassLoad.java webapps/docs/changelog.xml
Author: markt
Date: Tue May 20 11:26:02 2014
New Revision: 1596201
URL: http://svn.apache.org/r1596201
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56545
Pre-load two more classes to avoid exceptions when running under a security
manager
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1596201r1=1596200r2=1596201view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Tue
May 20 11:26:02 2014
@@ -149,6 +149,7 @@ public final class SecurityClassLoad {
throws Exception {
final String basePackage = org.apache.catalina.util.;
loader.loadClass(basePackage + ParameterMap);
+loader.loadClass(basePackage + RequestUtil);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1596201r1=1596200r2=1596201view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue May 20 11:26:02 2014
@@ -67,6 +67,11 @@
optionally interrupt stuck threads to attempt to unblock them.
(slaurent)
/add
+ fix
+bug56545/bug: Pre-load two additional classes, the loading of which
+may otherwise be triggered by a web application which in turn would
+trigger an exception when running under a security manager. (markt)
+ /fix
update
bug56546/bug: Reduce logging level for stack traces of stuck web
application threads printed by
WebappClassLoader.clearReferencesThreads()
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56545] Examples app security exceptions
https://issues.apache.org/bugzilla/show_bug.cgi?id=56545 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #6 from Mark Thomas ma...@apache.org --- These issues have been fixed in 8.0.x for 8.0.9 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596216 - in /tomcat/tc6.0.x/trunk: build.properties.default res/maven/mvn.properties.default
Author: kkolinko Date: Tue May 20 11:48:35 2014 New Revision: 1596216 URL: http://svn.apache.org/r1596216 Log: Prepare for next release Modified: tomcat/tc6.0.x/trunk/build.properties.default tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default Modified: tomcat/tc6.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1596216r1=1596215r2=1596216view=diff == --- tomcat/tc6.0.x/trunk/build.properties.default (original) +++ tomcat/tc6.0.x/trunk/build.properties.default Tue May 20 11:48:35 2014 @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=6 version.minor=0 -version.build=41 +version.build=42 version.patch=0 version.suffix=-dev Modified: tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default?rev=1596216r1=1596215r2=1596216view=diff == --- tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default Tue May 20 11:48:35 2014 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=6.0.41 +maven.asf.release.deploy.version=6.0.42 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-6-trunk
The Buildbot has detected a restored build on builder tomcat-6-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-6-trunk/builds/21 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc6.0.x/trunk] 1596216 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596217 - /tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
Author: kkolinko
Date: Tue May 20 11:59:12 2014
New Revision: 1596217
URL: http://svn.apache.org/r1596217
Log:
Further simplify the code
Merge two try/catch inside two branches of if/else.
factoryClass cannot be null after loadClass()/Class.forName() calls.
Modified:
tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
Modified: tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java?rev=1596217r1=1596216r2=1596217view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java Tue May 20
11:59:12 2014
@@ -56,37 +56,28 @@ public abstract class FactoryBase implem
// Loading factory
ClassLoader tcl =
Thread.currentThread().getContextClassLoader();
Class? factoryClass = null;
-if (tcl != null) {
-try {
+try {
+if (tcl != null) {
factoryClass = tcl.loadClass(factoryClassName);
-} catch(ClassNotFoundException e) {
-NamingException ex = new NamingException(
-Could not load resource factory class);
-ex.initCause(e);
-throw ex;
-}
-} else {
-try {
+} else {
factoryClass = Class.forName(factoryClassName);
-} catch(ClassNotFoundException e) {
-NamingException ex = new NamingException(
-Could not load resource factory class);
-ex.initCause(e);
-throw ex;
}
+} catch(ClassNotFoundException e) {
+NamingException ex = new NamingException(
+Could not load resource factory class);
+ex.initCause(e);
+throw ex;
}
-if (factoryClass != null) {
-try {
-factory = (ObjectFactory) factoryClass.newInstance();
-} catch(Throwable t) {
-if (t instanceof NamingException) {
-throw (NamingException) t;
-}
-NamingException ex = new NamingException(
-Could not create resource factory instance);
-ex.initCause(t);
-throw ex;
+try {
+factory = (ObjectFactory) factoryClass.newInstance();
+} catch(Throwable t) {
+if (t instanceof NamingException) {
+throw (NamingException) t;
}
+NamingException ex = new NamingException(
+Could not create resource factory instance);
+ex.initCause(t);
+throw ex;
}
} else {
// Check for a default factory
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596221 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
Author: kkolinko
Date: Tue May 20 12:08:21 2014
New Revision: 1596221
URL: http://svn.apache.org/r1596221
Log:
FindBugs
setup() vs setUp()
It is a merge of r1596189 from tomcat/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1596189
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java?rev=1596221r1=1596220r2=1596221view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
Tue May 20 12:08:21 2014
@@ -38,8 +38,10 @@ public class TestStuckThreadDetectionVal
private StandardContext context;
private Tomcat tomcat;
+@Override
@Before
-public void setup() {
+public void setUp() throws Exception {
+super.setUp();
tomcat = getTomcatInstance();
File docBase = new File(System.getProperty(java.io.tmpdir));
context = (StandardContext) tomcat.addContext(,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55824] HandshakeRequest.getHttpSession() may return null at ServerEndpointConfig.Configurator.modifyHandshake time
https://issues.apache.org/bugzilla/show_bug.cgi?id=55824 Henri Manson hfman...@gmail.com changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID |--- --- Comment #7 from Henri Manson hfman...@gmail.com --- I totally agree with Nikla Hallqvist that it would really be convenient to get an non-null httpSession when calling request.getHttpSession() in modifyHandshake. My endpoint uses File resources with a path that would be retrieved with ServletContext. I tried Nikla Hallqvist's method to obtain a ServletContext using @WebListener but that fails on Apache 8.0.3. I hope to get a solution for this problem -- 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 55824] HandshakeRequest.getHttpSession() may return null at ServerEndpointConfig.Configurator.modifyHandshake time
https://issues.apache.org/bugzilla/show_bug.cgi?id=55824 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |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
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/92 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1596141 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596226 - in /tomcat/trunk: java/org/apache/naming/factory/EjbFactory.java java/org/apache/naming/factory/FactoryBase.java java/org/apache/naming/factory/ResourceFactory.java webapps/docs
Author: kkolinko
Date: Tue May 20 12:29:41 2014
New Revision: 1596226
URL: http://svn.apache.org/r1596226
Log:
Improve handling of Throwable. Add changelog entry.
Modified:
tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java
tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java?rev=1596226r1=1596225r2=1596226view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java Tue May 20
12:29:41 2014
@@ -46,8 +46,15 @@ public class EjbFactory extends FactoryB
factory = (ObjectFactory)
Class.forName(javaxEjbFactoryClassName).newInstance();
} catch(Throwable t) {
-if (t instanceof NamingException)
+if (t instanceof NamingException) {
throw (NamingException) t;
+}
+if (t instanceof ThreadDeath) {
+throw (ThreadDeath) t;
+}
+if (t instanceof VirtualMachineError) {
+throw (VirtualMachineError) t;
+}
NamingException ex = new NamingException
(Could not create resource factory instance);
ex.initCause(t);
Modified: tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java?rev=1596226r1=1596225r2=1596226view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java Tue May 20
12:29:41 2014
@@ -74,6 +74,12 @@ public abstract class FactoryBase implem
if (t instanceof NamingException) {
throw (NamingException) t;
}
+if (t instanceof ThreadDeath) {
+throw (ThreadDeath) t;
+}
+if (t instanceof VirtualMachineError) {
+throw (VirtualMachineError) t;
+}
NamingException ex = new NamingException(
Could not create resource factory instance);
ex.initCause(t);
Modified: tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java?rev=1596226r1=1596225r2=1596226view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java Tue May 20
12:29:41 2014
@@ -60,6 +60,15 @@ public class ResourceFactory extends Fac
factory = (ObjectFactory)
Class.forName(javaxMailSessionFactoryClassName).newInstance();
} catch(Throwable t) {
+if (t instanceof NamingException) {
+throw (NamingException) t;
+}
+if (t instanceof ThreadDeath) {
+throw (ThreadDeath) t;
+}
+if (t instanceof VirtualMachineError) {
+throw (VirtualMachineError) t;
+}
NamingException ex = new NamingException(
Could not create resource factory instance);
ex.initCause(t);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1596226r1=1596225r2=1596226view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue May 20 12:29:41 2014
@@ -77,6 +77,12 @@
application threads printed by
WebappClassLoader.clearReferencesThreads()
from error to info. (kkolinko)
/update
+ scode
+Refactor and simplify common code in object factories in
+codeorg.apache.catalina.naming/code package, found thanks to Simian
+(Similarity Analyser) tool. Improve handling of Throwable.
+(markt/kkolinko)
+ /scode
/changelog
/subsection
section name=WebSocket
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/93 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1596217 Blamelist: kkolinko,markt BUILD FAILED: exception compile upload_2 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596227 - in /tomcat/trunk: build.properties.default webapps/docs/changelog.xml
Author: markt
Date: Tue May 20 12:32:42 2014
New Revision: 1596227
URL: http://svn.apache.org/r1596227
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56543
Update JDT to 4.4.RC1
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1596227r1=1596226r2=1596227view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Tue May 20 12:32:42 2014
@@ -128,9 +128,9 @@ wsdl4j-lib.home=${base.path}/wsdl4j-${ws
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar
wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar
-# - Eclipse JDT, version 3.2 or later -#
-jdt.version=P20140317-1600
-jdt.release=P20140317-1600
+# - Eclipse JDT, version 4.4RC1 or later -#
+jdt.version=4.4RC1
+jdt.release=S-4.4RC1-201405151230
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1596227r1=1596226r2=1596227view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue May 20 12:32:42 2014
@@ -85,7 +85,15 @@
/scode
/changelog
/subsection
- section name=WebSocket
+ subsection name=Jasper
+changelog
+ update
+bug56543/bug: Update to the Eclipse JDT Compiler 4.4RC1 to pick up
+some fixes for Java 8 support. (markt)
+ /update
+/changelog
+ /subsection
+ subsection name=WebSocket
changelog
scode
bug56446/bug: Clearer handling of exceptions when calling a method
@@ -93,7 +101,7 @@
Chung. (markt)
/scode
/changelog
- /section
+ /subsection
/section
section name=Tomcat 8.0.8 (markt)
subsection name=Catalina
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56543] Jasper fails to compile JSP pages when running with JDK 1.8
https://issues.apache.org/bugzilla/show_bug.cgi?id=56543 --- Comment #5 from Mark Thomas ma...@apache.org --- I've updated 8.0.x to 4.4RC1 which will be included in 8.0.9 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: buildbot failure in ASF Buildbot on tomcat-trunk
2014-05-20 16:29 GMT+04:00 build...@apache.org: The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/92 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1596141 Blamelist: markt Logs: http://ci.apache.org/projects/tomcat/tomcat8/1596141/ Failed org.apache.catalina.core.TestAsyncContextImpl. Nothing new here, timing is a bit longer on a slow machine. Failed org.apache.catalina.valves.TestStuckThreadDetectionValve due to class loading. The test run itself was aborted by a signal after running for ~3,5 hours. process killed by signal 9 program finished with exit code -1 elapsedTime=12313.777995 Thus a) BIO, NIO tests were run. It was killed while running NIO2 tests. b) I think it is only control process that was killed. The child junit process is probably still running. (The next buildbot run failed with Unable to delete directory .../output). From my local experience I think the child process will proceed with the rest of the tests. That is unless it is stuck somewhere. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/77 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1596221 Blamelist: kkolinko BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.54
On 2014-05-20, 6:04 AM, Violeta Georgieva wrote: The proposed 7.0.54 release is: [ ] Broken - do not release [X] Stable - go ahead and release as 7.0.54 Stable Tested AsyncContext NIO (usual Atmosphere Framework Testing) -- Jeanfrancois Regards Violeta - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.54
On 2014-05-20, 6:04 AM, Violeta Georgieva wrote: The proposed 7.0.54 release is: [ ] Broken - do not release [X] Stable - go ahead and release as 7.0.54 Stable Tested WebSocket (native jsr356 API) -- Jeanfrancois Regards Violeta - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596275 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/coyote/http11/upgrade/ webapps/docs/ webapps/docs/config/
Author: markt
Date: Tue May 20 14:46:48 2014
New Revision: 1596275
URL: http://svn.apache.org/r1596275
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56521
Implement a TODO
Reuse the async write buffer between writes to reduce allocation and GC
overhead. Based on a patch by leonzhx.
Also:
- don't re-allocate the buffer / move the data in the buffer if the buffer is
partially written on a subsequent write
- make the buffer size configurable, defaulting to 8k
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletOutputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/http.xml
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=1596275r1=1596274r2=1596275view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Tue
May 20 14:46:48 2014
@@ -166,6 +166,17 @@ public abstract class AbstractHttp11Prot
}
+/**
+ * The size of the buffer used by the ServletOutputStream when performing
+ * delayed asynchronous writes using HTTP upgraded connections.
+ */
+private int upgradeAsyncWriteBufferSize = 8192;
+public int getUpgradeAsyncWriteBufferSize() { return
upgradeAsyncWriteBufferSize; }
+public void setUpgradeAsyncWriteBufferSize(int
upgradeAsyncWriteBufferSize) {
+this.upgradeAsyncWriteBufferSize = upgradeAsyncWriteBufferSize;
+}
+
+
// HTTP specific
properties
// -- passed through to the
EndPoint
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1596275r1=1596274r2=1596275view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Tue May
20 14:46:48 2014
@@ -345,7 +345,8 @@ public class Http11AprProtocol extends A
HttpUpgradeHandler httpUpgradeProcessor)
throws IOException {
return new AprProcessor(socket, httpUpgradeProcessor,
-(AprEndpoint) proto.endpoint);
+(AprEndpoint) proto.endpoint,
+proto.getUpgradeAsyncWriteBufferSize());
}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1596275r1=1596274r2=1596275view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Tue May
20 14:46:48 2014
@@ -265,7 +265,8 @@ public class Http11Nio2Protocol extends
SocketWrapperNio2Channel socket,
HttpUpgradeHandler httpUpgradeProcessor)
throws IOException {
-return new Nio2Processor(proto.endpoint, socket,
httpUpgradeProcessor);
+return new Nio2Processor(proto.endpoint, socket,
httpUpgradeProcessor,
+proto.getUpgradeAsyncWriteBufferSize());
}
@Override
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/94 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1596227 Blamelist: kkolinko,markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596356 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java java/or
Author: markt
Date: Tue May 20 18:33:12 2014
New Revision: 1596356
URL: http://svn.apache.org/r1596356
Log:
Backport of r1557082
Better align 7.0.x with trunk to aid back-ports
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1557082
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java?rev=1596356r1=1596355r2=1596356view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
Tue May 20 18:33:12 2014
@@ -90,6 +90,10 @@ public abstract class AbstractServletInp
throw new IllegalArgumentException(
sm.getString(upgrade.sis.readListener.null));
}
+if (this.listener != null) {
+throw new IllegalArgumentException(
+sm.getString(upgrade.sis.readListener.set));
+}
this.listener = listener;
this.applicationLoader =
Thread.currentThread().getContextClassLoader();
// Switching to non-blocking. Don't know if data is available.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java?rev=1596356r1=1596355r2=1596356view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Tue May 20 18:33:12 2014
@@ -68,6 +68,10 @@ public abstract class AbstractServletOut
throw new IllegalArgumentException(
sm.getString(upgrade.sos.writeListener.null));
}
+if (this.listener != null) {
+throw new IllegalArgumentException(
+sm.getString(upgrade.sos.writeListener.set));
+}
this.listener = listener;
this.applicationLoader =
Thread.currentThread().getContextClassLoader();
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties?rev=1596356r1=1596355r2=1596356view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
Tue May 20 18:33:12 2014
@@ -19,9 +19,11 @@ abstractProcessor.osCloseFail=Failed to
upgrade.sis.isFinished.ise=It is illegal to call isFinished() when the
ServletInputStream is not in non-blocking mode (i.e. setReadListener() must be
called first)
upgrade.sis.isReady.ise=It is illegal to call isReady() when the
ServletInputStream is not in non-blocking mode (i.e. setReadListener() must be
called first)
upgrade.sis.readListener.null=It is illegal to pass null to setReadListener()
+upgrade.sis.readListener.set=It is illegal to call setReadListener() more than
once for the same upgraded connection
upgrade.sis.read.ise=It is illegal to call any of the read() methods in
non-blocking mode without first checking that there is data available by
calling isReady()
upgrade.sos.canWrite.ise=It is illegal to call canWrite() when the
ServletOutputStream is not in non-blocking mode (i.e. setWriteListener() must
be called first)
upgrade.sos.writeListener.null=It is illegal to pass null to setWriteListener()
+upgrade.sos.writeListener.set=It is illegal to call setWriteListener() more
than once for the same upgraded connection
upgrade.sis.write.ise=It is illegal to call any of the write() methods in
non-blocking mode without first checking that there is space available by
calling isReady()
apr.clientAbort=The client aborted the connection.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596357 - /tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Author: markt
Date: Tue May 20 18:34:38 2014
New Revision: 1596357
URL: http://svn.apache.org/r1596357
Log:
Correct comment
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java?rev=1596357r1=1596356r2=1596357view=diff
==
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Tue May 20 18:34:38 2014
@@ -98,8 +98,7 @@ public abstract class AbstractServletOut
sm.getString(upgrade.sos.writeListener.set));
}
// Container is responsible for first call to onWritePossible() but
only
-// need to do this if setting the listener for the first time rather
-// than changing it.
+// need to do this if setting the listener for the first time.
synchronized (fireListenerLock) {
fireListener = true;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596359 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Author: markt
Date: Tue May 20 18:38:02 2014
New Revision: 1596359
URL: http://svn.apache.org/r1596359
Log:
Backport of r1575545
Better align 7.0.x with trunk to aid back-ports
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1575545
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java?rev=1596359r1=1596358r2=1596359view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
Tue May 20 18:38:02 2014
@@ -68,15 +68,7 @@ public abstract class AbstractServletInp
try {
ready = Boolean.valueOf(doIsReady());
} catch (IOException e) {
-Thread thread = Thread.currentThread();
-ClassLoader originalClassLoader = thread.getContextClassLoader();
-try {
-thread.setContextClassLoader(applicationLoader);
-listener.onError(e);
-} finally {
-thread.setContextClassLoader(originalClassLoader);
-}
-ready = Boolean.FALSE;
+onError(e);
}
return ready.booleanValue();
}
@@ -184,7 +176,25 @@ public abstract class AbstractServletInp
}
+protected final void onAllDataRead() throws IOException {
+if (listener == null) {
+return;
+}
+Thread thread = Thread.currentThread();
+ClassLoader originalClassLoader = thread.getContextClassLoader();
+try {
+thread.setContextClassLoader(applicationLoader);
+listener.onAllDataRead();
+} finally {
+thread.setContextClassLoader(originalClassLoader);
+}
+}
+
+
protected final void onDataAvailable() throws IOException {
+if (listener == null) {
+return;
+}
ready = Boolean.TRUE;
Thread thread = Thread.currentThread();
ClassLoader originalClassLoader = thread.getContextClassLoader();
@@ -197,6 +207,22 @@ public abstract class AbstractServletInp
}
+protected final void onError(Throwable t) {
+if (listener == null) {
+return;
+}
+Thread thread = Thread.currentThread();
+ClassLoader originalClassLoader = thread.getContextClassLoader();
+try {
+thread.setContextClassLoader(applicationLoader);
+listener.onError(t);
+} finally {
+thread.setContextClassLoader(originalClassLoader);
+}
+ready = Boolean.FALSE;
+}
+
+
protected final boolean isCloseRequired() {
return closeRequired;
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java?rev=1596359r1=1596358r2=1596359view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Tue May 20 18:38:02 2014
@@ -145,14 +145,7 @@ public abstract class AbstractServletOut
writeInternal(buffer, 0, buffer.length);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
-Thread thread = Thread.currentThread();
-ClassLoader originalClassLoader =
thread.getContextClassLoader();
-try {
-thread.setContextClassLoader(applicationLoader);
-listener.onError(t);
-} finally {
-thread.setContextClassLoader(originalClassLoader);
-}
+onError(t);
if (t instanceof IOException) {
throw (IOException) t;
} else {
@@ -183,6 +176,21 @@ public abstract class AbstractServletOut
}
}
+protected final void onError(Throwable t) {
+if (listener == null) {
+return;
+}
+Thread thread = Thread.currentThread();
+ClassLoader originalClassLoader = thread.getContextClassLoader();
+try {
+
svn commit: r1596360 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Author: markt
Date: Tue May 20 18:41:56 2014
New Revision: 1596360
URL: http://svn.apache.org/r1596360
Log:
Backport of r1575885
Better align 7.0.x with trunk to aid back-ports
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1575885
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java?rev=1596360r1=1596359r2=1596360view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Tue May 20 18:41:56 2014
@@ -32,14 +32,29 @@ public abstract class AbstractServletOut
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
+// Used to ensure that isReady() and onWritePossible() have a consistent
+// view of buffer and fireListener when determining if the listener should
+// fire.
private final Object fireListenerLock = new Object();
+
+// Used to ensure that only one thread writes to the socket at a time and
+// that buffer is consistently updated with any unwritten data after the
+// write. Note it is not necessary to hold this lock when checking if
buffer
+// contains data but, depending on how the result is used, some form of
+// synchronization may be required (see fireListenerLock for an example).
private final Object writeLock = new Object();
private volatile boolean closeRequired = false;
+
// Start in blocking-mode
private volatile WriteListener listener = null;
+
+// Guarded by fireListenerLock
private volatile boolean fireListener = false;
+
private volatile ClassLoader applicationLoader = null;
+
+// Writes guarded by writeLock
private volatile byte[] buffer;
/**
@@ -152,26 +167,26 @@ public abstract class AbstractServletOut
throw new IOException(t);
}
}
+}
- // Make sure isReady() and onWritePossible() have a consistent view
of
-// buffer and fireListener when determining if the listener should
fire
-boolean fire = false;
-
-synchronized (fireListenerLock) {
-if (buffer == null fireListener) {
-fireListener = false;
-fire = true;
-}
+// Make sure isReady() and onWritePossible() have a consistent view of
+// buffer and fireListener when determining if the listener should fire
+boolean fire = false;
+
+synchronized (fireListenerLock) {
+if (buffer == null fireListener) {
+fireListener = false;
+fire = true;
}
-if (fire) {
-Thread thread = Thread.currentThread();
-ClassLoader originalClassLoader =
thread.getContextClassLoader();
-try {
-thread.setContextClassLoader(applicationLoader);
-listener.onWritePossible();
-} finally {
-thread.setContextClassLoader(originalClassLoader);
-}
+}
+if (fire) {
+Thread thread = Thread.currentThread();
+ClassLoader originalClassLoader = thread.getContextClassLoader();
+try {
+thread.setContextClassLoader(applicationLoader);
+listener.onWritePossible();
+} finally {
+thread.setContextClassLoader(originalClassLoader);
}
}
}
@@ -194,7 +209,8 @@ public abstract class AbstractServletOut
/**
* Abstract method to be overridden by concrete implementations. The base
* class will ensure that there are no concurrent calls to this method for
- * the same socket.
+ * the same socket by ensuring that the writeLock is held when making any
+ * calls this method.
*/
protected abstract int doWrite(boolean block, byte[] b, int off, int len)
throws IOException;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596362 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Author: markt
Date: Tue May 20 18:44:52 2014
New Revision: 1596362
URL: http://svn.apache.org/r1596362
Log:
Backport of r1575910
Better align 7.0.x with trunk to aid back-ports
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1575910
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java?rev=1596362r1=1596361r2=1596362view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Tue May 20 18:44:52 2014
@@ -155,17 +155,17 @@ public abstract class AbstractServletOut
protected final void onWritePossible() throws IOException {
-synchronized (writeLock) {
-try {
+try {
+synchronized (writeLock) {
writeInternal(buffer, 0, buffer.length);
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-onError(t);
-if (t instanceof IOException) {
-throw (IOException) t;
-} else {
-throw new IOException(t);
-}
+}
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+onError(t);
+if (t instanceof IOException) {
+throw (IOException) t;
+} else {
+throw new IOException(t);
}
}
@@ -210,7 +210,7 @@ public abstract class AbstractServletOut
* Abstract method to be overridden by concrete implementations. The base
* class will ensure that there are no concurrent calls to this method for
* the same socket by ensuring that the writeLock is held when making any
- * calls this method.
+ * calls to this method.
*/
protected abstract int doWrite(boolean block, byte[] b, int off, int len)
throws IOException;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596363 - /tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Author: markt
Date: Tue May 20 18:45:50 2014
New Revision: 1596363
URL: http://svn.apache.org/r1596363
Log:
Partila back-port of r1667092
Avoid possible NPE
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java?rev=1596363r1=1596362r2=1596363view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Tue May 20 18:45:50 2014
@@ -157,7 +157,9 @@ public abstract class AbstractServletOut
protected final void onWritePossible() throws IOException {
try {
synchronized (writeLock) {
-writeInternal(buffer, 0, buffer.length);
+if (buffer != null) {
+writeInternal(buffer, 0, buffer.length);
+}
}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56526] New option to interrupt stuck threads
https://issues.apache.org/bugzilla/show_bug.cgi?id=56526 --- Comment #5 from Christopher Schultz ch...@christopherschultz.net --- I don't think Thread.interrupt will interrupt a blocking I/O operation, at least not reliably. IIRC, this works on *NIX but not Windows. While this patch probably makes things better, it's not an absolute solution to the problem of stuck threads. Perhaps a followup documentation patch is appropriate mentioning the caveats of attempting to unstick stuck threads. -- 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: r1596367 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/ java/org/apache/coyote/http11/upgrade/ webapps/docs/ webapps/docs/config/
Author: markt
Date: Tue May 20 19:02:46 2014
New Revision: 1596367
URL: http://svn.apache.org/r1596367
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56521
Implement a TODO
Reuse the async write buffer between writes to reduce allocation and GC
overhead. Based on a patch by leonzhx.
Also:
- don't re-allocate the buffer / move the data in the buffer if the buffer is
partially written on a subsequent write
- make the buffer size configurable, defaulting to 8k
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/BioProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/BioServletOutputStream.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1596275
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1596367r1=1596366r2=1596367view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Tue May 20 19:02:46 2014
@@ -174,6 +174,17 @@ public abstract class AbstractHttp11Prot
}
+/**
+ * The size of the buffer used by the ServletOutputStream when performing
+ * delayed asynchronous writes using HTTP upgraded connections.
+ */
+private int upgradeAsyncWriteBufferSize = 8192;
+public int getUpgradeAsyncWriteBufferSize() { return
upgradeAsyncWriteBufferSize; }
+public void setUpgradeAsyncWriteBufferSize(int
upgradeAsyncWriteBufferSize) {
+this.upgradeAsyncWriteBufferSize = upgradeAsyncWriteBufferSize;
+}
+
+
// HTTP specific
properties
// -- passed through to the
EndPoint
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1596367r1=1596366r2=1596367view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
Tue May 20 19:02:46 2014
@@ -339,7 +339,8 @@ public class Http11AprProtocol extends A
HttpUpgradeHandler httpUpgradeProcessor)
throws IOException {
return new AprProcessor(socket, httpUpgradeProcessor,
-(AprEndpoint) proto.endpoint);
+(AprEndpoint) proto.endpoint,
+proto.getUpgradeAsyncWriteBufferSize());
}
}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1596367r1=1596366r2=1596367view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Tue May 20 19:02:46 2014
@@ -298,7 +298,8 @@ public class Http11NioProtocol extends A
HttpUpgradeHandler httpUpgradeProcessor)
throws IOException {
return new NioProcessor(socket, httpUpgradeProcessor,
-((Http11NioProtocol)
getProtocol()).getEndpoint().getSelectorPool());
+proto.getEndpoint().getSelectorPool(),
+proto.getUpgradeAsyncWriteBufferSize());
}
}
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
[Bug 56521] Reuse the output buffer in AbstractServletOutputStream
https://issues.apache.org/bugzilla/show_bug.cgi?id=56521 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #6 from Mark Thomas ma...@apache.org --- Fixed in 8.0.x for 8.0.9 onwards and in 7.0.x fir 7.0.55 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56526] New option to interrupt stuck threads
https://issues.apache.org/bugzilla/show_bug.cgi?id=56526 --- Comment #6 from Sylvain Laurent slaur...@apache.org --- well, it's not perfect, as I tried to briefly explain in the configuration doc, but in my experience, it should work in many cases where the thread is blocked on a network call. Actually that was my primary motivation for this feature. In my experience this is a good safety net against APIs that don't provide network timeouts or applications that don't configure their timeout (a very common situation with JDBC or JNDI). Instead of a documentation patch, what about a wiki page instead ? -- 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: buildbot failure in ASF Buildbot on tomcat-trunk
I'll have a look at this right now. On 19 mai 2014, at 23:28, Konstantin Kolinko knst.koli...@gmail.com wrote: 2014-05-19 23:30 GMT+04:00 build...@apache.org: The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/89 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1595898 Blamelist: markt BUILD FAILED: failed compile_1 The failed test is org.apache.catalina.valves.TestStuckThreadDetectionValve x NIO. BIO and NIO2 runs were OK. http://ci.apache.org/projects/tomcat/tomcat8/1595898/ http://ci.apache.org/projects/tomcat/tomcat8/1595898/TEST-org.apache.catalina.valves.TestStuckThreadDetectionValve.NIO.txt A difference is that there was an attempt to load a class which failed on a stopped web application. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/78 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1596363 Blamelist: markt Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 6.0.41
On 19/05/2014 13:58, Mark Thomas wrote: The proposed Apache Tomcat 6.0.41 release candidate is now available for voting. The main changes since 6.0.40 are: - Fix BZ 56529 The main changes since 6.0.39 are: - Add support for using ecj-P20140317-1600.jar to use Java 8 syntax in JSPs - Update native library to 1.1.30 - Various improvements to XML processing along with a number of bug fixes. Full details are in the change log. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.41/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1014/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_41 The proposed 6.0.41 release is: [ ] Broken - do not release [X} Stable - go ahead and release as 6.0.41 Stable Servlet and JSP TCKs pass. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596390 - /tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
Author: slaurent
Date: Tue May 20 20:19:01 2014
New Revision: 1596390
URL: http://svn.apache.org/r1596390
Log:
fixed timing and enclosed thread.join in a finally to avoid stopping the webapp
before the request is finished (in case of assertion failure)
Modified:
tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
Modified:
tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java?rev=1596390r1=1596389r2=1596390view=diff
==
---
tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
Tue May 20 20:19:01 2014
@@ -51,7 +51,7 @@ public class TestStuckThreadDetectionVal
@Test
public void testDetection() throws Exception {
// second, we test the actual effect of the flag on the startup
-StuckingServlet stuckingServlet = new StuckingServlet(5000L);
+StuckingServlet stuckingServlet = new StuckingServlet(6000L);
Wrapper servlet = Tomcat.addServlet(context, myservlet,
stuckingServlet);
servlet.addMapping(/myservlet);
@@ -78,14 +78,15 @@ public class TestStuckThreadDetectionVal
};
asyncThread.start();
-
-Thread.sleep(1000L);
-Assert.assertEquals(0, valve.getStuckThreadIds().length);
-
-Thread.sleep(2000L);
-Assert.assertEquals(1, valve.getStuckThreadIds().length);
-
-asyncThread.join();
+try {
+Thread.sleep(500L);
+Assert.assertEquals(0, valve.getStuckThreadIds().length);
+
+Thread.sleep(3000L);
+Assert.assertEquals(1, valve.getStuckThreadIds().length);
+} finally {
+asyncThread.join();
+}
Assert.assertFalse(stuckingServlet.wasInterrupted);
Assert.assertTrue(result.toString().startsWith(OK));
}
@@ -101,7 +102,7 @@ public class TestStuckThreadDetectionVal
StuckThreadDetectionValve valve = new StuckThreadDetectionValve();
valve.setThreshold(2);
-valve.setInterruptThreadThreshold(4);
+valve.setInterruptThreadThreshold(5);
context.addValve(valve);
context.setBackgroundProcessorDelay(1);
tomcat.start();
@@ -122,18 +123,16 @@ public class TestStuckThreadDetectionVal
};
asyncThread.start();
-
-Thread.sleep(1000L);
-Assert.assertEquals(0, valve.getStuckThreadIds().length);
-
-Thread.sleep(3000L);
-Assert.assertEquals(1, valve.getStuckThreadIds().length);
-
-Thread.sleep(3000L);
-Assert.assertTrue(stuckingServlet.wasInterrupted);
-Assert.assertEquals(0, valve.getStuckThreadIds().length);
-
-asyncThread.join();
+try {
+Thread.sleep(4000L);
+Assert.assertEquals(1, valve.getStuckThreadIds().length);
+
+Thread.sleep(4000L);
+Assert.assertTrue(stuckingServlet.wasInterrupted);
+Assert.assertEquals(0, valve.getStuckThreadIds().length);
+} finally {
+asyncThread.join();
+}
Assert.assertTrue(result.toString().startsWith(OK));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596401 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
Author: slaurent
Date: Tue May 20 20:36:14 2014
New Revision: 1596401
URL: http://svn.apache.org/r1596401
Log:
fixed timing and enclosed thread.join in a finally to avoid stopping the webapp
before the request is finished (in case of assertion failure)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1596390
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java?rev=1596401r1=1596400r2=1596401view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
Tue May 20 20:36:14 2014
@@ -51,7 +51,7 @@ public class TestStuckThreadDetectionVal
@Test
public void testDetection() throws Exception {
// second, we test the actual effect of the flag on the startup
-StuckingServlet stuckingServlet = new StuckingServlet(5000L);
+StuckingServlet stuckingServlet = new StuckingServlet(6000L);
Wrapper servlet = Tomcat.addServlet(context, myservlet,
stuckingServlet);
servlet.addMapping(/myservlet);
@@ -78,14 +78,15 @@ public class TestStuckThreadDetectionVal
};
asyncThread.start();
-
-Thread.sleep(1000L);
-Assert.assertEquals(0, valve.getStuckThreadIds().length);
-
-Thread.sleep(2000L);
-Assert.assertEquals(1, valve.getStuckThreadIds().length);
-
-asyncThread.join();
+try {
+Thread.sleep(500L);
+Assert.assertEquals(0, valve.getStuckThreadIds().length);
+
+Thread.sleep(3000L);
+Assert.assertEquals(1, valve.getStuckThreadIds().length);
+} finally {
+asyncThread.join();
+}
Assert.assertFalse(stuckingServlet.wasInterrupted);
Assert.assertTrue(result.toString().startsWith(OK));
}
@@ -101,7 +102,7 @@ public class TestStuckThreadDetectionVal
StuckThreadDetectionValve valve = new StuckThreadDetectionValve();
valve.setThreshold(2);
-valve.setInterruptThreadThreshold(4);
+valve.setInterruptThreadThreshold(5);
context.addValve(valve);
context.setBackgroundProcessorDelay(1);
tomcat.start();
@@ -122,18 +123,16 @@ public class TestStuckThreadDetectionVal
};
asyncThread.start();
-
-Thread.sleep(1000L);
-Assert.assertEquals(0, valve.getStuckThreadIds().length);
-
-Thread.sleep(3000L);
-Assert.assertEquals(1, valve.getStuckThreadIds().length);
-
-Thread.sleep(3000L);
-Assert.assertTrue(stuckingServlet.wasInterrupted);
-Assert.assertEquals(0, valve.getStuckThreadIds().length);
-
-asyncThread.join();
+try {
+Thread.sleep(4000L);
+Assert.assertEquals(1, valve.getStuckThreadIds().length);
+
+Thread.sleep(4000L);
+Assert.assertTrue(stuckingServlet.wasInterrupted);
+Assert.assertEquals(0, valve.getStuckThreadIds().length);
+} finally {
+asyncThread.join();
+}
Assert.assertTrue(result.toString().startsWith(OK));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: buildbot failure in ASF Buildbot on tomcat-trunk
I think I fixed the problem, which was only in the test case. There was a timing issue (the bot seems to be even slower than my 5 years old mac), which provoked an assertion failure. It then provoked the class loading issue because the request was still stuck in the background when the test returned... I hope this will be ok with the next build... Sylvain On 20 mai 2014, at 21:14, Sylvain Laurent slaur...@apache.org wrote: I'll have a look at this right now. On 19 mai 2014, at 23:28, Konstantin Kolinko knst.koli...@gmail.com wrote: 2014-05-19 23:30 GMT+04:00 build...@apache.org: The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/89 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1595898 Blamelist: markt BUILD FAILED: failed compile_1 The failed test is org.apache.catalina.valves.TestStuckThreadDetectionValve x NIO. BIO and NIO2 runs were OK. http://ci.apache.org/projects/tomcat/tomcat8/1595898/ http://ci.apache.org/projects/tomcat/tomcat8/1595898/TEST-org.apache.catalina.valves.TestStuckThreadDetectionValve.NIO.txt A difference is that there was an attempt to load a class which failed on a stopped web application. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/79 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1596367 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1596415 - /tomcat/site/trunk/docs/ci.html
Author: slaurent Date: Tue May 20 20:58:55 2014 New Revision: 1596415 URL: http://svn.apache.org/r1596415 Log: fixed URLs to documentation snapshots Modified: tomcat/site/trunk/docs/ci.html Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1596415r1=1596414r2=1596415view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Tue May 20 20:58:55 2014 @@ -263,14 +263,14 @@ prepared and published by ASF Buildbot, ul li -a href=http://ci.apache.org/projects/tomcat/tomcat8/docs/index.html; rel=nofollowTomcat trunk/a (8.0.x)/li +a href=http://ci.apache.org/projects/tomcat/tomcat8/index.html; rel=nofollowTomcat trunk/a (8.0.x)/li li -a href=http://ci.apache.org/projects/tomcat/tomcat7/docs/index.html; rel=nofollowTomcat 7.0.x/a +a href=http://ci.apache.org/projects/tomcat/tomcat7/index.html; rel=nofollowTomcat 7.0.x/a /li li -a href=http://ci.apache.org/projects/tomcat/tomcat6/docs/index.html; rel=nofollowTomcat 6.0.x/a +a href=http://ci.apache.org/projects/tomcat/tomcat6/index.html; rel=nofollowTomcat 6.0.x/a /li /ul - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1596415 - /tomcat/site/trunk/docs/ci.html
2014-05-21 0:58 GMT+04:00 slaur...@apache.org: Author: slaurent Date: Tue May 20 20:58:55 2014 New Revision: 1596415 URL: http://svn.apache.org/r1596415 Log: fixed URLs to documentation snapshots -1. 1. This shall be fixed not here, but in Buildbot configuration. 2. It writes documentation and coverage (and logs) into the same place. Whether you are seeing docs or coverage depends on whether a build is running in this very moment. 3. ci.html only? (Without xml) Modified: tomcat/site/trunk/docs/ci.html Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1596415r1=1596414r2=1596415view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Tue May 20 20:58:55 2014 @@ -263,14 +263,14 @@ prepared and published by ASF Buildbot, ul li -a href=http://ci.apache.org/projects/tomcat/tomcat8/docs/index.html; rel=nofollowTomcat trunk/a (8.0.x)/li +a href=http://ci.apache.org/projects/tomcat/tomcat8/index.html; rel=nofollowTomcat trunk/a (8.0.x)/li li -a href=http://ci.apache.org/projects/tomcat/tomcat7/docs/index.html; rel=nofollowTomcat 7.0.x/a +a href=http://ci.apache.org/projects/tomcat/tomcat7/index.html; rel=nofollowTomcat 7.0.x/a /li li -a href=http://ci.apache.org/projects/tomcat/tomcat6/docs/index.html; rel=nofollowTomcat 6.0.x/a +a href=http://ci.apache.org/projects/tomcat/tomcat6/index.html; rel=nofollowTomcat 6.0.x/a /li /ul - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1596415 - /tomcat/site/trunk/docs/ci.html
so, I just have to fix /xdocs/ci.xml ? and the buildbot generates ci.html and commits it ? On 20 mai 2014, at 23:14, Konstantin Kolinko knst.koli...@gmail.com wrote: 2014-05-21 0:58 GMT+04:00 slaur...@apache.org: Author: slaurent Date: Tue May 20 20:58:55 2014 New Revision: 1596415 URL: http://svn.apache.org/r1596415 Log: fixed URLs to documentation snapshots -1. 1. This shall be fixed not here, but in Buildbot configuration. 2. It writes documentation and coverage (and logs) into the same place. Whether you are seeing docs or coverage depends on whether a build is running in this very moment. 3. ci.html only? (Without xml) Modified: tomcat/site/trunk/docs/ci.html Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1596415r1=1596414r2=1596415view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Tue May 20 20:58:55 2014 @@ -263,14 +263,14 @@ prepared and published by ASF Buildbot, ul li -a href=http://ci.apache.org/projects/tomcat/tomcat8/docs/index.html; rel=nofollowTomcat trunk/a (8.0.x)/li +a href=http://ci.apache.org/projects/tomcat/tomcat8/index.html; rel=nofollowTomcat trunk/a (8.0.x)/li li -a href=http://ci.apache.org/projects/tomcat/tomcat7/docs/index.html; rel=nofollowTomcat 7.0.x/a +a href=http://ci.apache.org/projects/tomcat/tomcat7/index.html; rel=nofollowTomcat 7.0.x/a /li li -a href=http://ci.apache.org/projects/tomcat/tomcat6/docs/index.html; rel=nofollowTomcat 6.0.x/a +a href=http://ci.apache.org/projects/tomcat/tomcat6/index.html; rel=nofollowTomcat 6.0.x/a /li /ul - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/80 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1596401 Blamelist: slaurent Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1596415 - /tomcat/site/trunk/docs/ci.html
2014-05-21 1:41 GMT+04:00 Sylvain Laurent slaur...@apache.org: so, I just have to fix /xdocs/ci.xml ? and the buildbot generates ci.html and commits it ? 1. No. The tomcat.apache.org web site is authored in XML (just like Tomcat documentation). See README.txt and build.xml in the root directory of /site. It is odd that you edited and committed generated HTML file only. 2. The old links were correct. The buildbot is misconfigured and publishes generated documentation snapshots, junit logs and coverage reports into a wrong place (all in the same directory instead of subdirectories). On 20 mai 2014, at 23:14, Konstantin Kolinko knst.koli...@gmail.com wrote: 2014-05-21 0:58 GMT+04:00 slaur...@apache.org: Author: slaurent Date: Tue May 20 20:58:55 2014 New Revision: 1596415 URL: http://svn.apache.org/r1596415 Log: fixed URLs to documentation snapshots -1. 1. This shall be fixed not here, but in Buildbot configuration. 2. It writes documentation and coverage (and logs) into the same place. Whether you are seeing docs or coverage depends on whether a build is running in this very moment. 3. ci.html only? (Without xml) Modified: tomcat/site/trunk/docs/ci.html Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1596415r1=1596414r2=1596415view=diff - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of PoweredBy by CoreyNorthcutt
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The PoweredBy page has been changed by CoreyNorthcutt: https://wiki.apache.org/tomcat/PoweredBy?action=diffrev1=478rev2=479 Comment: added, alphabetized 1. [[http://www.farmerguy.co.uk|Farmer Guy Hams and Gammons]]: is a small web site offering home made hams and gammons for the christmas season, we only have a small jsp order form on tomcat but it works really well. Many thanks to the Tomcat team. 1. [[http://www.Fichedepersonnalite.com|Fichedepersonnalite.com]]: use Tomcat for the database process of result. 1. [[http://fluency.knownspace.org|Fluency]] is a dynamic user interface builder that uses Tomcat for its infrastructure. + 1. [[http://www.frankfurt-it-service.de|Frankfurt IT-Service]]: offers on site support IT services. + 1. [[http://www.futurehosting.com|FutureHosting.com]]: A U.S./U.K./Australian managed hosting provider that operates Tomcat and JBOSS VZ-based virtual containers. 1. [[http://www.fwdco.com|F.W.Davison Co.]]: develops payroll and human resource software, including HRPyramid Web Edition which is an employee and manager web self-services software built on Tomcat. - 1. [[http://www.frankfurt-it-service.de|Frankfurt IT-Service]]: offers on site support IT services. 1. [[http://dev.mainsoft.com/Default.aspx?tabid=130|The Grasshopper]] : Developer Zone web site is an ASP.NET application running on Tomcat using Grasshopper that ports [[http://www.mono-project.com|Mono]] open source .NET framework to Tomcat. - 1. [[http://www.gm.com|General Motors]]: One of the largest car-makers and financers in the world. + 1. [[http://www.gm.com|General Motors]]: One of the largest car-makers and financiers in the world. 1. [[http://www.hotelsandaccommodation.com.au/|Hotels and Accommodation]]: is an Australian accommodation site. The website utilizes a hotel database system using Tomcat. 1. [[http://www.homegevity.com/|Homegevity]] is a National Real Estate and Rental site. The site runs a complex property database system using Tomcat. 1. [[http://dev.hubspot.com/|HubSpot]]: is an inbound marketing system to help your small or medium sized business get found on the Internet by the right prospects and convert more of them into leads and customers for maximum marketing ROI. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of PoweredBy by CoreyNorthcutt
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The PoweredBy page has been changed by CoreyNorthcutt: https://wiki.apache.org/tomcat/PoweredBy?action=diffrev1=479rev2=480 Comment: and moved under the correct heading (/facepalm) 1. [[http://www.Fichedepersonnalite.com|Fichedepersonnalite.com]]: use Tomcat for the database process of result. 1. [[http://fluency.knownspace.org|Fluency]] is a dynamic user interface builder that uses Tomcat for its infrastructure. 1. [[http://www.frankfurt-it-service.de|Frankfurt IT-Service]]: offers on site support IT services. - 1. [[http://www.futurehosting.com|FutureHosting.com]]: A U.S./U.K./Australian managed hosting provider that operates Tomcat and JBOSS VZ-based virtual containers. 1. [[http://www.fwdco.com|F.W.Davison Co.]]: develops payroll and human resource software, including HRPyramid Web Edition which is an employee and manager web self-services software built on Tomcat. 1. [[http://dev.mainsoft.com/Default.aspx?tabid=130|The Grasshopper]] : Developer Zone web site is an ASP.NET application running on Tomcat using Grasshopper that ports [[http://www.mono-project.com|Mono]] open source .NET framework to Tomcat. 1. [[http://www.gm.com|General Motors]]: One of the largest car-makers and financiers in the world. @@ -144, +143 @@ 1. [[http://www.eapps.com/applications/tomcat-hosting.php|Eapps.com]]: eApps Hosting has provided hosting for Java applications using Tomcat since 2000 and now offers Tomcat hosting in a reliable, economical VPS container with 24/7 support by in-house staff. 1. [[http://www.enciva.com/|Enciva Solutions Ltd.]]: Enciva Solutions Ltd. offers premium U.S. and U.K based Tomcat hosting solutions. MySQL, Oracle, and PostgreSQL database options. Tomcat 5, 6, and 7. All plans feature private JVM and 1Gbps network speed. VPS and dedicated solutions also available. 1. [[http://www.energizedhosting.com|Energized Hosting]]: Energized Hosting uses Tomcat for its Servlet/JSP hosting needs. + 1. [[http://www.futurehosting.com|FutureHosting.com]]: A U.S./U.K./Australian managed hosting provider that operates Tomcat and JBOSS VZ-based virtual containers. 1. [[http://gojava.net|goJava.net - Java / Tomcat Hosting]]: goJava.net - Java / Tomcat Hosting, Dedicated JAVA / Tomcat hosting company. Private Tomcat instances, versions 5.5 / 6.0 / 7.0 supported, Linux CentOS 6.x 64bit servers, minimum 2 x Quad Core CPUs and 24-48 GB RAM. Only Private Tomcat plans. Private Tomcat Lite $7.99/pm (128 MB heap size), Pro $14.99 (256 MB heap size), extra 128 MB heap size for $5. 14 days Trial available! 1. [[http://www.greatjsphosting.com|Great JSP Hosting]]: Great JSP Hosting was created to allow for quick and painless deployment of Java applications. GreatJSPhosting offers java hosting based on Apache Tomcat 7 and JDK 1.7, and Java Xen VPS with pre-installed Tomcat version 7 and full support for Apache Tomcat servlet container. Dedicated Tomcat and Java Hosting company! 1. [[http://www.homehost.com.br/|HomeHost - Hospedagem de Sites]]: HomeHost - Hospedagem de Sites provides webhosting with support to JSP/Servlets by using Tomcat. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
