Re: svn commit: r1716039 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties webapps/docs/changelog.xml
2015-11-24 7:19 GMT+01:00 : > Author: kfujino > Date: Tue Nov 24 06:19:37 2015 > New Revision: 1716039 > > URL: http://svn.apache.org/viewvc?rev=1716039&view=rev > Log: > Correct the warnnig log of when the member that is not registered in the > membership is detected. > > Since we were talking about that recently, that change is too trivial to warrant a changelog entry. Rémy
Re: svn commit: r1716039 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties webapps/docs/changelog.xml
2015-11-24 17:37 GMT+09:00 Rémy Maucherat : > 2015-11-24 7:19 GMT+01:00 : > > > Author: kfujino > > Date: Tue Nov 24 06:19:37 2015 > > New Revision: 1716039 > > > > URL: http://svn.apache.org/viewvc?rev=1716039&view=rev > > Log: > > Correct the warnnig log of when the member that is not registered in the > > membership is detected. > > > > Since we were talking about that recently, that change is too trivial to > warrant a changelog entry. > > Thanks. I'll remove it. > Rémy > > -- > Keiichi.Fujino >
svn commit: r1716083 - /tomcat/trunk/webapps/docs/changelog.xml
Author: kfujino Date: Tue Nov 24 09:11:16 2015 New Revision: 1716083 URL: http://svn.apache.org/viewvc?rev=1716083&view=rev Log: Remove changelog entry of r1716039. Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1716083&r1=1716082&r2=1716083&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Nov 24 09:11:16 2015 @@ -133,10 +133,6 @@ if the static member that is registered to the remove suspect list has disappeared. (kfujino) - -Correct the warnnig log of when the member that is not registered in the -membership is detected. (kfujino) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat 8.0.29
The following votes were cast: Binding: +1: markt, mgrigorov, remm, fschumacher, violetagg, kfujino Non-binding: +1: Huxing Zhang The vote therefore passes. Thanks to everyone who helped with this release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58624] Websocket send blocks indefinitely in FutureToSendHandler
https://bz.apache.org/bugzilla/show_bug.cgi?id=58624 Mark Thomas changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #8 from Mark Thomas --- Thanks for the analysis. I'll take a look. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-validate : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 1 min 14 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.13-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.13-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20151124.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.5-SNAPSHOT.ja r:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20151124.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20151124.jar:/srv/gump/packages/guava/guava-18.0.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-6.13-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 6.13-SNAPSHOT on 3072 files [checkstyle] /srv/gump/public/workspace/tomcat-trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java:78:9: error: File contains tab characters (this is the first instance). [checkstyle] /srv/gump/public/workspace/tomcat-trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java:91: error: Line matches the illegal pattern '\s+$'. BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:554: Got 2 errors and 0 warnings. Total time: 1 minute 13 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 20151124120005, vmgump.apache.org:vmgump:20151124120005 Gump E-mail Identifier (unique within run) #1. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Apache Tomcat YouTube channel
Benjamin, On 11/20/15 2:52 AM, Benjamin Gandon wrote: > Don’t hesitate to share the link to this channel as soon as it is available, > so that people can subscribe to it! +1 Mark, do we have a link we can share with colleagues who can't attend today's presentation? Just a public link for seeing the videos. Thanks, -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Apache Tomcat YouTube channel
On 24/11/2015 14:45, Christopher Schultz wrote: > Benjamin, > > On 11/20/15 2:52 AM, Benjamin Gandon wrote: >> Don’t hesitate to share the link to this channel as soon as it is available, >> so that people can subscribe to it! > > +1 > > Mark, do we have a link we can share with colleagues who can't attend > today's presentation? Just a public link for seeing the videos. I was planning on posting it to the lists (and tweeting) once I have uploaded the video. Based on my test conversion this morning, it looks like it will take me an hour or two to get the video converted and edited (just to trim dead time at start and end). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1716213 - /tomcat/trunk/webapps/docs/windows-service-howto.xml
Author: markt Date: Tue Nov 24 17:03:14 2015 New Revision: 1716213 URL: http://svn.apache.org/viewvc?rev=1716213&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58631 Correct continuation character for Windows Modified: tomcat/trunk/webapps/docs/windows-service-howto.xml Modified: tomcat/trunk/webapps/docs/windows-service-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/windows-service-howto.xml?rev=1716213&r1=1716212&r2=1716213&view=diff == --- tomcat/trunk/webapps/docs/windows-service-howto.xml (original) +++ tomcat/trunk/webapps/docs/windows-service-howto.xml Tue Nov 24 17:03:14 2015 @@ -360,11 +360,11 @@ C:\> service.bat install MyService.exe, you need to use the //IS// parameter. Install the service named 'Tomcat' -C:\> tomcat //IS//Tomcat --DisplayName="Apache Tomcat " \ -C:\> --Install="C:\Program Files\Tomcat\bin\tomcat.exe" --Jvm=auto \ -C:\> --StartMode=jvm --StopMode=jvm \ -C:\> --StartClass=org.apache.catalina.startup.Bootstrap --StartParams=start \ -C:\> --StopClass=org.apache.catalina.startup.Bootstrap --StopParams=stop +C:\> tomcat //IS//Tomcat --DisplayName="Apache Tomcat " ^ + --Install="C:\Program Files\Tomcat\bin\tomcat.exe" --Jvm=auto ^ + --StartMode=jvm --StopMode=jvm ^ + --StartClass=org.apache.catalina.startup.Bootstrap --StartParams=start ^ + --StopClass=org.apache.catalina.startup.Bootstrap --StopParams=stop @@ -373,15 +373,15 @@ To update the service parameters, you ne Update the service named 'Tomcat' -C:\> tomcat //US//Tomcat --Description="Apache Tomcat Server - http://tomcat.apache.org/ " \ -C:\> --Startup=auto --Classpath=%JAVA_HOME%\lib\tools.jar;%CATALINA_HOME%\bin\bootstrap.jar +C:\> tomcat //US//Tomcat --Description="Apache Tomcat Server - http://tomcat.apache.org/ " ^ + --Startup=auto --Classpath=%JAVA_HOME%\lib\tools.jar;%CATALINA_HOME%\bin\bootstrap.jar If you gave the service an optional name, you need to specify it like this: Update the service named 'MyService' -C:\> tomcat //US//MyService --Description="Apache Tomcat Server - http://tomcat.apache.org/ " \ -C:\> --Startup=auto --Classpath=%JAVA_HOME%\lib\tools.jar;%CATALINA_HOME%\bin\bootstrap.jar +C:\> tomcat //US//MyService --Description="Apache Tomcat Server - http://tomcat.apache.org/ " ^ + --Startup=auto --Classpath=%JAVA_HOME%\lib\tools.jar;%CATALINA_HOME%\bin\bootstrap.jar - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r11287 - /dev/tomcat/tomcat-8/v8.0.29/ /release/tomcat/tomcat-8/v8.0.29/
Author: markt Date: Tue Nov 24 11:11:44 2015 New Revision: 11287 Log: Release 8.0.29 Added: release/tomcat/tomcat-8/v8.0.29/ - copied from r11286, dev/tomcat/tomcat-8/v8.0.29/ Removed: dev/tomcat/tomcat-8/v8.0.29/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1716106 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Nov 24 11:17:03 2015 New Revision: 1716106 URL: http://svn.apache.org/viewvc?rev=1716106&view=rev Log: Add release date for 8.0.29 Trim some long lines. Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1716106&r1=1716105&r2=1716106&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Nov 24 11:17:03 2015 @@ -48,9 +48,9 @@ -34319: Only load those keys in StoreBase.processExpire -from JDBCStore, that are old enough, to be expired. Based on a patch -by Tom Anderson. (fschumacher) +34319: Only load those keys in +StoreBase.processExpire from JDBCStore, that are old +enough, to be expired. Based on a patch by Tom Anderson. (fschumacher) 58629: Allow an embedded Tomcat instance to start when the @@ -100,8 +100,10 @@ -Correct evaluation of system property org.apache.tomcat.jdbc.pool.onlyAttemptCurrentClassLoader. -It was basically ignored before. Reported by coverity scan. (fschumacher) +Correct evaluation of system property +org.apache.tomcat.jdbc.pool.onlyAttemptCurrentClassLoader. +It was basically ignored before. Reported by coverity scan. +(fschumacher) Fix potential integer overflow in ConnectionPool and @@ -110,7 +112,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1716105 - in /tomcat/tc8.0.x/trunk: build.properties.default res/maven/mvn.properties.default
Author: markt Date: Tue Nov 24 11:14:52 2015 New Revision: 1716105 URL: http://svn.apache.org/viewvc?rev=1716105&view=rev Log: Update version info for next release Modified: tomcat/tc8.0.x/trunk/build.properties.default tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default Modified: tomcat/tc8.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.properties.default?rev=1716105&r1=1716104&r2=1716105&view=diff == --- tomcat/tc8.0.x/trunk/build.properties.default (original) +++ tomcat/tc8.0.x/trunk/build.properties.default Tue Nov 24 11:14:52 2015 @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=8 version.minor=0 -version.build=29 +version.build=30 version.patch=0 version.suffix=-dev Modified: tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default?rev=1716105&r1=1716104&r2=1716105&view=diff == --- tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default Tue Nov 24 11:14:52 2015 @@ -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=8.0.29 +maven.asf.release.deploy.version=8.0.30 #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: r1716214 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Nov 24 17:05:54 2015 New Revision: 1716214 URL: http://svn.apache.org/viewvc?rev=1716214&view=rev Log: Update changelog Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1716214&r1=1716213&r2=1716214&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Nov 24 17:05:54 2015 @@ -126,6 +126,14 @@ + + + +58631: Correct the continuation character use in the Windows +Service How-To page of the documenation web application. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Time for Tomcat 7.0.66
Hi, Tomorrow morning I plan to prepare Tomcat 7.0.66 for voting. If you want to add something to this release, please reply here. Regards, Violeta
svn commit: r1716152 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
Author: markt
Date: Tue Nov 24 14:50:26 2015
New Revision: 1716152
URL: http://svn.apache.org/viewvc?rev=1716152&view=rev
Log:
Checkstyle police
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java?rev=1716152&r1=1716151&r2=1716152&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java Tue
Nov 24 14:50:26 2015
@@ -75,7 +75,7 @@ public class OpenSSLUtil implements SSLU
type = sslHostConfig.getTruststoreType();
}
if (sslHostConfig.getTruststoreAlgorithm() != null) {
- algorithm = sslHostConfig.getTruststoreAlgorithm();
+algorithm = sslHostConfig.getTruststoreAlgorithm();
}
TrustManagerFactory factory;
@@ -86,9 +86,9 @@ public class OpenSSLUtil implements SSLU
KeyStore keystore = KeyStore.getInstance(type);
try (InputStream stream = ConfigFileLoader.getInputStream(storefile)) {
- keystore.load(stream, password.toCharArray());
+keystore.load(stream, password.toCharArray());
}
-
+
factory.init(keystore);
TrustManager[] managers = factory.getTrustManagers();
return managers;
-
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-8-trunk
The Buildbot has detected a new failure on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/293 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1716217 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: r1716216 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Nov 24 17:16:33 2015 New Revision: 1716216 URL: http://svn.apache.org/viewvc?rev=1716216&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58631 Correct continuation character for Windows Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1716216&r1=1716215&r2=1716216&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Nov 24 17:16:33 2015 @@ -84,6 +84,14 @@ + + + +58631: Correct the continuation character use in the Windows +Service How-To page of the documenation web application. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1716217 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/windows-service-howto.xml
Author: markt Date: Tue Nov 24 17:18:47 2015 New Revision: 1716217 URL: http://svn.apache.org/viewvc?rev=1716217&view=rev Log: Correct continuation character for Windows Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/windows-service-howto.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 24 17:18:47 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657 609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1 666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,168573 9,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696
svn commit: r1716221 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/windows-service-howto.xml
Author: markt Date: Tue Nov 24 17:34:58 2015 New Revision: 1716221 URL: http://svn.apache.org/viewvc?rev=1716221&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58631 Correct continuation character for Windows Align docs with 8.0.x version Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/windows-service-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 24 17:34:58 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702 744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1
svn commit: r1716098 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
Author: remm
Date: Tue Nov 24 10:29:08 2015
New Revision: 1716098
URL: http://svn.apache.org/viewvc?rev=1716098&view=rev
Log:
This looks like a good "try with resources" candidate.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java?rev=1716098&r1=1716097&r2=1716098&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java Tue
Nov 24 10:29:08 2015
@@ -16,7 +16,6 @@
*/
package org.apache.tomcat.util.net.openssl;
-import java.io.IOException;
import java.io.InputStream;
import java.security.KeyStore;
import java.util.List;
@@ -86,20 +85,8 @@ public class OpenSSLUtil implements SSLU
factory = TrustManagerFactory.getInstance(algorithm);
KeyStore keystore = KeyStore.getInstance(type);
-InputStream stream = null;
-try {
- stream = ConfigFileLoader.getInputStream(storefile);
+try (InputStream stream = ConfigFileLoader.getInputStream(storefile)) {
keystore.load(stream, password.toCharArray());
-} catch (Exception ex) {
- throw ex;
-} finally {
-if (stream != null) {
-try {
-stream.close();
-} catch (IOException ioe) {
-// Do nothing
-}
-}
}
factory.init(keystore);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1716224 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/windows-service-howto.xml
Author: markt Date: Tue Nov 24 18:01:46 2015 New Revision: 1716224 URL: http://svn.apache.org/viewvc?rev=1716224&view=rev Log: Correct continuation character for Windows Align docs with 8.0.x version Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 24 18:01:46 2015 @@ -1,3 +1,3 @@ -/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989,1668541 ,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213 -/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207 -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770 809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265 ,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,93
Re: svn commit: r1715633 - in /tomcat/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java webapps/docs/changelog.xml
Am 23.11.2015 um 03:19 schrieb Huxing Zhang:
Hi fschumacher,
Just a friendly reminder that I had a discussion with kkolinko about this
before.
I seems that it is better to explicitly define the default value rather than
the Boolean.getBoolean syntactic sugar.
Thanks for the hint.
I will change it.
Regards,
Felix
private static final boolean onlyAttemptFirstLoader =
-
Boolean.getBoolean(System.getProperty("org.apache.tomcat.jdbc.pool.onlyAttemptCurrentClassLoader",
"false"));
+
Boolean.getBoolean("org.apache.tomcat.jdbc.pool.onlyAttemptCurrentClassLoader");
Details can be found here:
https://bz.apache.org/bugzilla/show_bug.cgi?id=58564
--
From:fschumacher
Time:2015 Nov 22 (Sun) 23:29
To:dev
Subject:svn commit: r1715633 - in /tomcat/trunk:
modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java
webapps/docs/changelog.xml
Author: fschumacher
Date: Sun Nov 22 15:28:55 2015
New Revision: 1715633
URL: http://svn.apache.org/viewvc?rev=1715633&view=rev
Log:
Correct evaluation of system property
org.apache.tomcat.jdbc.pool.onlyAttemptCurrentClassLoader.
It was basically ignored before. Reported by coverity scan.
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java?rev=1715633&r1=1715632&r2=1715633&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java
Sun Nov 22 15:28:55 2015
@@ -24,7 +24,7 @@ public class ClassLoaderUtil {
private static final Log log = LogFactory.getLog(ClassLoaderUtil.class);
private static final boolean onlyAttemptFirstLoader =
-
Boolean.getBoolean(System.getProperty("org.apache.tomcat.jdbc.pool.onlyAttemptCurrentClassLoader",
"false"));
+
Boolean.getBoolean("org.apache.tomcat.jdbc.pool.onlyAttemptCurrentClassLoader");
public static Class loadClass(String className, ClassLoader... classLoaders) throws ClassNotFoundException {
ClassNotFoundException last = null;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1715633&r1=1715632&r2=1715633&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Nov 22 15:28:55 2015
@@ -95,6 +95,14 @@
+
+
+
+Correct evaluation of system property
org.apache.tomcat.jdbc.pool.onlyAttemptCurrentClassLoader.
+It was basically ignored before. Reported by coverity scan.
(fschumacher)
+
+
+
-
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
svn commit: r1716258 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java
Author: fschumacher
Date: Tue Nov 24 21:06:07 2015
New Revision: 1716258
URL: http://svn.apache.org/viewvc?rev=1716258&view=rev
Log:
Make default value (false) clearer.
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java?rev=1716258&r1=1716257&r2=1716258&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java
Tue Nov 24 21:06:07 2015
@@ -24,7 +24,7 @@ public class ClassLoaderUtil {
private static final Log log = LogFactory.getLog(ClassLoaderUtil.class);
private static final boolean onlyAttemptFirstLoader =
-
Boolean.getBoolean("org.apache.tomcat.jdbc.pool.onlyAttemptCurrentClassLoader");
+
Boolean.parseBoolean(System.getProperty("org.apache.tomcat.jdbc.pool.onlyAttemptCurrentClassLoader",
"false"));
public static Class loadClass(String className, ClassLoader...
classLoaders) throws ClassNotFoundException {
ClassNotFoundException last = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1716259 - in /tomcat/tc8.0.x/trunk: ./ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java
Author: fschumacher Date: Tue Nov 24 21:07:33 2015 New Revision: 1716259 URL: http://svn.apache.org/viewvc?rev=1716259&view=rev Log: Make default value (false) clearer. Merge r1716258 from /tomcat/trunk Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 24 21:07:33 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657 609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1 666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,168573 9,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354
[Bug 58646] NullPointerException in InternalNioOutputBuffer under traffic related to config.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58646 Alexander Malyshev changed: What|Removed |Added Priority|P2 |P3 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58646] New: NullPointerException in InternalNioOutputBuffer under traffic related to config.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58646 Bug ID: 58646 Summary: NullPointerException in InternalNioOutputBuffer under traffic related to config. Product: Tomcat 8 Version: 8.0.28 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: anmalys...@mail.ru We're using Tomcat in our product. Under traffic we can reproduce the following exceptions: Nov 23, 2015 CST 08:34:58.115 PM org.apache.coyote.http11.Http11NioProcessor INFO: Error parsing HTTP request header Note: further occurrences of HTTP header parsing errors will be logged at DEBUG level. Nov 23, 2015 CST 08:34:58.118 PM org.apache.coyote.http11.Http11NioProcessor SEVERE: Error finishing response java.lang.NullPointerException at org.apache.coyote.http11.InternalNioOutputBuffer.flushBuffer(InternalNioOutputBuffer.java:234) at org.apache.coyote.http11.InternalNioOutputBuffer.addToBB(InternalNioOutputBuffer.java:189) at org.apache.coyote.http11.InternalNioOutputBuffer.commit(InternalNioOutputBuffer.java:177) at org.apache.coyote.http11.AbstractHttp11Processor.action(AbstractHttp11Processor.java:741) at org.apache.coyote.Response.action(Response.java:177) at org.apache.coyote.http11.AbstractOutputBuffer.endRequest(AbstractOutputBuffer.java:369) at org.apache.coyote.http11.AbstractHttp11Processor.endRequest(AbstractHttp11Processor.java:1804) at org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:1143) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:673) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1500) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1456) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.lang.Thread.run(Thread.java:745) We have several applications deployed on our Tomcat. Most of the applications are simple Jersey Rest service applications. Above NullPointer is related to one of them (basically, the one which is called during traffic - I bet other apps will have the same issue if they would be called). Also we have one application which is using WebSockets (Tomcat implementation) and Async support for Comet. WebSocket interface is used during traffic testing while Comet is NOT (Servlets are not called). We have the following in our Tomcat main web.xml file (comparing to the default one): CorsFilter com.avaya.acc.base.web.filters.CorsFilter true CorsFilter /* NoCachingFilter com.avaya.acc.base.web.filters.NoCachingFilter true Set-Expires false No-Store true NoCachingFilter /* NoCachingFilter enableCaching Set-Expires=true;No-Store=false;patterns=*.js,*.swf,*.jar,*.png,*.jpg,*.css stinger.excluded.url.patterns /Comet/StartLiveSession,/Comet/Data,/Comet/EndLiveSession And the following in the web.xml for application which has issues: http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";> Live Viewer org.glassfish.jersey.servlet.ServletContainer javax.ws.rs.Application com.avaya.acc.wcs.api.viewer.rest.app.LiveViewerRestApp com.sun.jersey.api.json.POJOMappingFeature true sendfileSize -1 1 Live Viewer /rest/* I tried to remove async-supported from all our web.xml files and the issue is gone. So it's definitely related to configuration - without even actually using async functionality. We still need async-supported for our Comet interface so just disabling async is not an option for us. I can turn on some additional logging and reproduce again if this will help - just let me know which logging is needed. -- 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 58647] After blocking write timeout occurs, WsRemoteEndpointImplBase remains in BINARY_PARTIAL_WRITING state.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58647 Alexander Malyshev changed: What|Removed |Added OS||All Priority|P2 |P3 -- 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 58647] New: After blocking write timeout occurs, WsRemoteEndpointImplBase remains in BINARY_PARTIAL_WRITING state.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58647 Bug ID: 58647 Summary: After blocking write timeout occurs, WsRemoteEndpointImplBase remains in BINARY_PARTIAL_WRITING state. Product: Tomcat 8 Version: 8.0.28 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: WebSocket Assignee: dev@tomcat.apache.org Reporter: anmalys...@mail.ru We're using Tomcat WebSocket implementation for our product. We're using partial writing feature. Everything works as expected until any issue happens during write (TimeoutException, for example). After this happens - WsRemoteEndpointImplBase remains in BINARY_PARTIAL_WRITING state and we can't write anything to this WS connection anymore. Following exception thrown in case we try: java.lang.IllegalStateException: The remote endpoint was in state [BINARY_PARTIAL_WRITING] which is an invalid state for called method at org.apache.tomcat.websocket.WsRemoteEndpointImplBase$StateMachine.checkState(WsRemoteEndpointImplBase.java:1148) at org.apache.tomcat.websocket.WsRemoteEndpointImplBase$StateMachine.binaryPartialStart(WsRemoteEndpointImplBase.java:1096) at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.sendPartialBytes(WsRemoteEndpointImplBase.java:162) at org.apache.tomcat.websocket.WsRemoteEndpointBasic.sendBinary(WsRemoteEndpointBasic.java:56) at com.avaya.acc.wcs.transport.websocket.impl.WsClientOutbound.writeBytes(WsClientOutbound.java:48) Sometimes timeout means that connection is terminated, but in other cases it would be useful to retry writing - which is not possible because of this state issue. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 42 mins 36 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151124-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20151124/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151124.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151124-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20151124/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.
[Bug 58631] Documentation uses wrong syntax for windows command line continuation
https://bz.apache.org/bugzilla/show_bug.cgi?id=58631 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Thanks for the report. This as been fixed in 9.0.x for 9.0.0.M1 onwards, 8.0.x for 8.0.30 onwards, 7.0.x for 7.0.66 onwards and 6.0.x for 6.0.45 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
buildbot success in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/294 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1716259 Blamelist: fschumacher 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: r1716269 - in /tomcat/trunk: java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java webapps/docs/changel
Author: markt
Date: Tue Nov 24 22:20:22 2015
New Revision: 1716269
URL: http://svn.apache.org/viewvc?rev=1716269&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58624
Correct a potential deadlock if the WebSocket connection is closed when a
message write is in progress.
Added:
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
(with props)
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1716269&r1=1716268&r2=1716269&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Tue Nov 24 22:20:22 2015
@@ -289,15 +289,13 @@ public abstract class WsRemoteEndpointIm
}
long timeout = timeoutExpiry - System.currentTimeMillis();
-synchronized (messagePartLock) {
-try {
-if (!messagePartInProgress.tryAcquire(timeout,
TimeUnit.MILLISECONDS)) {
-throw new SocketTimeoutException();
-}
-} catch (InterruptedException e) {
-// TODO i18n
-throw new IOException(e);
+try {
+if (!messagePartInProgress.tryAcquire(timeout,
TimeUnit.MILLISECONDS)) {
+throw new SocketTimeoutException();
}
+} catch (InterruptedException e) {
+// TODO i18n
+throw new IOException(e);
}
for (MessagePart mp : messageParts) {
Added:
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java?rev=1716269&view=auto
==
---
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
(added)
+++
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
Tue Nov 24 22:20:22 2015
@@ -0,0 +1,180 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.websocket.server;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import javax.servlet.ServletContextEvent;
+import javax.websocket.CloseReason;
+import javax.websocket.ContainerProvider;
+import javax.websocket.DeploymentException;
+import javax.websocket.EncodeException;
+import javax.websocket.Encoder;
+import javax.websocket.EndpointConfig;
+import javax.websocket.OnClose;
+import javax.websocket.OnError;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.WebSocketContainer;
+import javax.websocket.server.ServerContainer;
+import javax.websocket.server.ServerEndpointConfig;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.servlets.DefaultServlet;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.websocket.pojo.TesterUtil.SimpleClient;
+
+public class TestWsRemoteEndpointImplServer extends TomcatBaseTest {
+
+/*
+ * https://bz.apache.org/bugzilla/show_bug.cgi?id=58624
+ *
+ * This test requires three breakpoints to be set. Two in this file (marked
+ * A & B with comments) and one (C) at the start of
+ * WsRemoteEndpointImplServer.doWrite().
+ *
+ * With the breakpoints in place, run this test.
+ * Once breakpoints A & B are reached, progress the thread at breakpoint A
+ * one line to close the connection.
+ * Once breakpoint C is reached, allow the thread at breakpo
[Bug 58624] Websocket send blocks indefinitely in FutureToSendHandler
https://bz.apache.org/bugzilla/show_bug.cgi?id=58624 --- Comment #9 from Mark Thomas --- Thanks for the great analysis and test case. I've fixed this in 9.0.x for 9.0.0.M2. There has been some refactoring of the relevant code so a back-port may take a little longer than usual. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58646] NullPointerException in InternalNioOutputBuffer under traffic related to config.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58646 --- Comment #1 from Alexander Malyshev --- After some more testing it turns out it's not related to async-supported tag. It's just intermittent. Also, sometimes this one happens before below exceptions: Nov 24, 2015 CST 04:18:48.480 PM org.apache.catalina.connector.CoyoteAdapter INFO: Encountered a non-recycled request and recycled it forcedly. org.apache.catalina.connector.CoyoteAdapter$RecycleRequiredException at org.apache.catalina.connector.CoyoteAdapter.checkRecycled(CoyoteAdapter.java:710) at org.apache.coyote.http11.AbstractHttp11Processor.recycle(AbstractHttp11Processor.java:1828) at org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.release(Http11NioProtocol.java:219) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:727) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1500) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1456) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.lang.Thread.run(Thread.java:745) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58646] NullPointerException in InternalNioOutputBuffer under traffic related to config.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58646 --- Comment #2 from Alexander Malyshev --- Note also that the amount of regular HTTP request during testing is not huge - nearly 10-12 requests/second. Amount of websocket traffic is huge, but it does not seem to affect these exceptions - issue can happen in the beginning of the test when WS traffic is still small as well as in the end of the test. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58646] NullPointerException in InternalNioOutputBuffer under traffic related to config.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58646 --- Comment #3 from Konstantin Kolinko --- 1) > Nov 23, 2015 CST 08:34:58.115 PM org.apache.coyote.http11.Http11NioProcessor > INFO: Error parsing HTTP request header > Note: further occurrences of HTTP header parsing errors will be logged at > DEBUG level. The above logging is controlled by org.apache.juli.logging.UserDataHelper.CONFIG system property [1]. The log message was likely written by "catch (Throwable t)" clause in AbstractHttp11Processor.process(). That is the only place where UserDataHelper is used in a processor. Unfortunately, it does not log the stacktrace, even with debug logging. It can be improved with a code change in AbstractHttp11Processor.java line 1058, -getLog().debug(message); +getLog().debug(message, t); (An easy test case: I have seen such messages when erroneously trying to connect with https:// to a http connector.) 2) I do not see thread names in your log. It is likely that the two errors are related (being just 3ms apart), but it is unclear whether the two errors occurred in the same thread. It is known that org.apache.juli.OneLineFormatter writes the thread names. 3) Usual advice with misbehaving requests/responses is to add the following property into conf/catalina.properties file: [2] org.apache.catalina.connector.RECYCLE_FACADES=true It should make your configuration more robust against common mistake of accessing Request/Response objects outside of their life cycle. 4) BTW, Tomcat 8.0.29 was released several hours ago. I think that it will be announced tomorrow. [1] http://tomcat.apache.org/tomcat-8.0-doc/config/systemprops.html#Logging [2] http://tomcat.apache.org/tomcat-8.0-doc/security-howto.html#System_Properties -- 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
Today's Tomcat 9 HTTP/2 webinar is now available on YouTube
All, As promised, today's webinar "Apache Tomcat 9: HTTP/2 Quick Start" is now available on the Apache Tomcat YouTube channel: https://www.youtube.com/channel/UCpqpJ0-G1lYfUBQ6_36Au_g Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1716276 - in /tomcat/site/trunk: docs/presentations.html xdocs/presentations.xml
Author: markt Date: Tue Nov 24 23:19:10 2015 New Revision: 1716276 URL: http://svn.apache.org/viewvc?rev=1716276&view=rev Log: Update after today's Webinar Modified: tomcat/site/trunk/docs/presentations.html tomcat/site/trunk/xdocs/presentations.xml Modified: tomcat/site/trunk/docs/presentations.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1716276&r1=1716275&r2=1716276&view=diff == --- tomcat/site/trunk/docs/presentations.html (original) +++ tomcat/site/trunk/docs/presentations.html Tue Nov 24 23:19:10 2015 @@ -218,19 +218,7 @@ presentations then please do let us know Scheduled presentations -Apache Tomcat 9: HTTP/2 quick start (markt). - - - -Webinar: http://markmail.org/message/suiwwo57fpasyw2g";>Tuesday -24 November 2015 10.00 UTC - - -Webinar: http://markmail.org/message/xwxq6etj2scjmllp";>Tuesday -24 November 2015 20.00 UTC - - - +TBC. @@ -270,6 +258,21 @@ mailing list. + + + + + +Webinar Series 2015 + + + + +Tomcat 9: HTTP/2 Quick Start (markt) https://www.youtube.com/watch?v=oCFwgMvouis";>video + + + + Modified: tomcat/site/trunk/xdocs/presentations.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1716276&r1=1716275&r2=1716276&view=diff == --- tomcat/site/trunk/xdocs/presentations.xml (original) +++ tomcat/site/trunk/xdocs/presentations.xml Tue Nov 24 23:19:10 2015 @@ -16,13 +16,7 @@ presentations then please do let us know Tomcat Users mailing list. -Apache Tomcat 9: HTTP/2 quick start (markt). - -Webinar: http://markmail.org/message/suiwwo57fpasyw2g";>Tuesday -24 November 2015 10.00 UTC -Webinar: http://markmail.org/message/xwxq6etj2scjmllp";>Tuesday -24 November 2015 20.00 UTC - +TBC. @@ -44,6 +38,12 @@ mailing list. + + +Tomcat 9: HTTP/2 Quick Start (markt) https://www.youtube.com/watch?v=oCFwgMvouis";>video + + + Tomcat Clustering: Part 1 - Reverse Proxies (markt) slides - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1716278 - /tomcat/site/trunk/docs/googlefd74ad0d669c4787.html
Author: markt Date: Tue Nov 24 23:38:17 2015 New Revision: 1716278 URL: http://svn.apache.org/viewvc?rev=1716278&view=rev Log: Add verification for Google (YouTube) Added: tomcat/site/trunk/docs/googlefd74ad0d669c4787.html (with props) Added: tomcat/site/trunk/docs/googlefd74ad0d669c4787.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/googlefd74ad0d669c4787.html?rev=1716278&view=auto == --- tomcat/site/trunk/docs/googlefd74ad0d669c4787.html (added) +++ tomcat/site/trunk/docs/googlefd74ad0d669c4787.html Tue Nov 24 23:38:17 2015 @@ -0,0 +1 @@ +google-site-verification: googlefd74ad0d669c4787.html \ No newline at end of file Propchange: tomcat/site/trunk/docs/googlefd74ad0d669c4787.html -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58624] Websocket send blocks indefinitely in FutureToSendHandler
https://bz.apache.org/bugzilla/show_bug.cgi?id=58624
--- Comment #10 from Barry Coughlan ---
(In reply to Mark Thomas from comment #9)
> Thanks for the great analysis and test case. I've fixed this in 9.0.x for
> 9.0.0.M2. There has been some refactoring of the relevant code so a
> back-port may take a little longer than usual.
Thanks a lot for the speedy fix Mark.
For future readers, we currently work around this in Tomcat 8 by replicating
the behaviour of getBasicRemote().sendObject() but with a timeout on the
future, so that at least our application can recover:
Future f = session.getAsyncRemote().sendObject(...)
try {
f.get(10, TimeUnit.SECONDS);
} catch (InterruptedException e) {
throw new IOException(e);
} catch (ExecutionException e) {
Throwable cause = e.getCause();
if (cause instanceof IOException) {
throw (IOException) cause;
} else if (cause instanceof EncodeException) {
throw (EncodeException) cause;
} else {
throw new IOException(e);
}
} catch (TimeoutException e) {
throw new IOException(e);
}
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-apr : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 35 mins 46 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-APR -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151124.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=true -Dexecute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/wo rkspace/apache-commons/daemon/dist/bin/commons-daemon-20151124-native-src.tar.gz -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151124-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20151124/lib -Dexecute.test.nio=false -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20151124.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace
svn commit: r1716305 - in /tomcat/trunk: java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java webapps/docs/changelog.xml
Author: kfujino
Date: Wed Nov 25 05:39:26 2015
New Revision: 1716305
URL: http://svn.apache.org/viewvc?rev=1716305&view=rev
Log:
When using a static cluster, add the members that have been cached in the
membership service to the map members list in order to ensure that the map
member is a static member.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1716305&r1=1716304&r2=1716305&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Nov 25 05:39:26 2015
@@ -733,9 +733,10 @@ public abstract class AbstractReplicated
if ( member.equals(getChannel().getLocalMember(false)) ) return;
boolean memberAdded = false;
//select a backup node if we don't have one
+Member mapMember = getChannel().getMember(member);
synchronized (mapMembers) {
-if (!mapMembers.containsKey(member) ) {
-mapMembers.put(member,
Long.valueOf(System.currentTimeMillis()));
+if (!mapMembers.containsKey(mapMember) ) {
+mapMembers.put(mapMember,
Long.valueOf(System.currentTimeMillis()));
memberAdded = true;
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1716305&r1=1716304&r2=1716305&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 25 05:39:26 2015
@@ -145,6 +145,11 @@
if the static member that is registered to the remove suspect list has
disappeared. (kfujino)
+
+When using a static cluster, add the members that have been cached in
+the membership service to the map members list in order to ensure that
+the map member is a static member. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1716306 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java webapps/docs/changelog.xml
Author: kfujino
Date: Wed Nov 25 05:42:01 2015
New Revision: 1716306
URL: http://svn.apache.org/viewvc?rev=1716306&view=rev
Log:
When using a static cluster, add the members that have been cached in the
membership service to the map members list in order to ensure that the map
member is a static member.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1716306&r1=1716305&r2=1716306&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Nov 25 05:42:01 2015
@@ -734,9 +734,10 @@ public abstract class AbstractReplicated
if ( member.equals(getChannel().getLocalMember(false)) ) return;
boolean memberAdded = false;
//select a backup node if we don't have one
+Member mapMember = getChannel().getMember(member);
synchronized (mapMembers) {
-if (!mapMembers.containsKey(member) ) {
-mapMembers.put(member,
Long.valueOf(System.currentTimeMillis()));
+if (!mapMembers.containsKey(mapMember) ) {
+mapMembers.put(mapMember,
Long.valueOf(System.currentTimeMillis()));
memberAdded = true;
}
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1716306&r1=1716305&r2=1716306&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Nov 25 05:42:01 2015
@@ -103,6 +103,11 @@
Correct the warnnig log of when the member that is not registered in
the
membership is detected. (kfujino)
+
+When using a static cluster, add the members that have been cached in
+the membership service to the map members list in order to ensure that
+the map member is a static member. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Today's Tomcat 9 HTTP/2 webinar is now available on YouTube
For those who can't access youtube, you can find the video on youku.com: http://v.youku.com/v_show/id_XMTM5NTU3Mjk2MA==.html -- From:Mark Thomas Time:2015 Nov 25 (Wed) 07:11 To:us...@tomcat.apache.org Subject:Today's Tomcat 9 HTTP/2 webinar is now available on YouTube All, As promised, today's webinar "Apache Tomcat 9: HTTP/2 Quick Start" is now available on the Apache Tomcat YouTube channel: https://www.youtube.com/channel/UCpqpJ0-G1lYfUBQ6_36Au_g Mark - 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
svn commit: r1716307 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java webapps/docs/changelog.xml
Author: kfujino
Date: Wed Nov 25 05:44:46 2015
New Revision: 1716307
URL: http://svn.apache.org/viewvc?rev=1716307&view=rev
Log:
When using a static cluster, add the members that have been cached in the
membership service to the map members list in order to ensure that the map
member is a static member.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1716307&r1=1716306&r2=1716307&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Nov 25 05:44:46 2015
@@ -738,9 +738,10 @@ public abstract class AbstractReplicated
if ( member.equals(getChannel().getLocalMember(false)) ) return;
boolean memberAdded = false;
//select a backup node if we don't have one
+Member mapMember = getChannel().getMember(member);
synchronized (mapMembers) {
-if (!mapMembers.containsKey(member) ) {
-mapMembers.put(member,
Long.valueOf(System.currentTimeMillis()));
+if (!mapMembers.containsKey(mapMember) ) {
+mapMembers.put(mapMember,
Long.valueOf(System.currentTimeMillis()));
memberAdded = true;
}
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1716307&r1=1716306&r2=1716307&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Nov 25 05:44:46 2015
@@ -226,6 +226,11 @@
Correct the warnnig log of when the member that is not registered in
the
membership is detected. (kfujino)
+
+When using a static cluster, add the members that have been cached in
+the membership service to the map members list in order to ensure that
+the map member is a static member. (kfujino)
+
-
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/189 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1716307 Blamelist: kfujino 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: svn commit: r1716305 - in /tomcat/trunk: java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java webapps/docs/changelog.xml
2015-11-25 8:39 GMT+03:00 :
> Author: kfujino
> Date: Wed Nov 25 05:39:26 2015
> New Revision: 1716305
>
> URL: http://svn.apache.org/viewvc?rev=1716305&view=rev
> Log:
> When using a static cluster, add the members that have been cached in the
> membership service to the map members list in order to ensure that the map
> member is a static member.
>
> Modified:
>
> tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
> tomcat/trunk/webapps/docs/changelog.xml
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1716305&r1=1716304&r2=1716305&view=diff
> ==
> ---
> tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
> (original)
> +++
> tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
> Wed Nov 25 05:39:26 2015
> @@ -733,9 +733,10 @@ public abstract class AbstractReplicated
> if ( member.equals(getChannel().getLocalMember(false)) ) return;
> boolean memberAdded = false;
> //select a backup node if we don't have one
> +Member mapMember = getChannel().getMember(member);
Can "getChannel().getMember(member)" call return null? Using null
value as a key for mapMembers looks wrong.
E.g. I see that
org.apache.catalina.tribes.membership.Membership.getMember(Member) may
return null.
The Membership.getMember(Member) method is not a Channel method, but
it is used to implement
DomainFilterInterceptor.getMember(Member mbr)
NonBlockingCoordinator.getMember(Member mbr)
TcpFailureDetector.getMember(Member mbr)
MCastService.getMember(Member)
> synchronized (mapMembers) {
> -if (!mapMembers.containsKey(member) ) {
> -mapMembers.put(member,
> Long.valueOf(System.currentTimeMillis()));
> +if (!mapMembers.containsKey(mapMember) ) {
> +mapMembers.put(mapMember,
> Long.valueOf(System.currentTimeMillis()));
> memberAdded = true;
> }
> }
>
> Modified: tomcat/trunk/webapps/docs/changelog.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1716305&r1=1716304&r2=1716305&view=diff
> ==
> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 25 05:39:26 2015
> @@ -145,6 +145,11 @@
> if the static member that is registered to the remove suspect list
> has
> disappeared. (kfujino)
>
> +
> +When using a static cluster, add the members that have been cached in
> +the membership service to the map members list in order to ensure
> that
> +the map member is a static member. (kfujino)
> +
>
>
>
>
>
>
> -
> 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: Time for Tomcat 7.0.66
2015-11-24 22:38 GMT+03:00 Violeta Georgieva :
> Hi,
>
> Tomorrow morning I plan to prepare Tomcat 7.0.66 for voting.
> If you want to add something to this release, please reply here.
1. The fix implementing configuration option for EL quoting (BZ 57136,
r1712859) has not been ported to Tomcat 7 yet.
I also plan to restore the old behaviour by default, for the reasons I
explained in thread "On escaping of EL in attributes (BZ 57136)" on
dev@.
I am working on it. Estimation is ~2 hours.
2. I have a question on recent tribes commit that has been committed
to Tomcat 7 as well (see Re: r1716305).
I guess a fix there is to simply add the following lines, falling back
to old behaviour.
if (mapMember == null) {
mapMember = member;
}
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Time for Tomcat 7.0.66
2015-11-25 9:32 GMT+02:00 Konstantin Kolinko :
>
> 2015-11-24 22:38 GMT+03:00 Violeta Georgieva :
> > Hi,
> >
> > Tomorrow morning I plan to prepare Tomcat 7.0.66 for voting.
> > If you want to add something to this release, please reply here.
>
> 1. The fix implementing configuration option for EL quoting (BZ 57136,
> r1712859) has not been ported to Tomcat 7 yet.
>
> I also plan to restore the old behaviour by default, for the reasons I
> explained in thread "On escaping of EL in attributes (BZ 57136)" on
> dev@.
>
> I am working on it. Estimation is ~2 hours.
>
Ok
>
> 2. I have a question on recent tribes commit that has been committed
> to Tomcat 7 as well (see Re: r1716305).
>
> I guess a fix there is to simply add the following lines, falling back
> to old behaviour.
>
> if (mapMember == null) {
> mapMember = member;
> }
I saw this.
I'll wait for these changes.
Regards,
Violeta
> Best regards,
> Konstantin Kolinko
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
