svn commit: r1498808 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Author: violetagg
Date: Tue Jul 2 07:15:30 2013
New Revision: 1498808
URL: http://svn.apache.org/r1498808
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55180
Correctly handle infinite soTimeout when disableUploadTimeout is set to false.
Patch provided by Roger Wang.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1498808&r1=1498807&r2=1498808&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Tue
Jul 2 07:15:30 2013
@@ -1068,7 +1068,11 @@ public abstract class AbstractHttp11Proc
}
if (!disableUploadTimeout) {
-setSocketTimeout(endpoint.getSoTimeout());
+if(endpoint.getSoTimeout() > 0) {
+setSocketTimeout(endpoint.getSoTimeout());
+} else {
+setSocketTimeout(0);
+}
}
rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1498811 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractHttp11Processor.java webapps/docs/changelog.xml
Author: violetagg
Date: Tue Jul 2 07:30:18 2013
New Revision: 1498811
URL: http://svn.apache.org/r1498811
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55180
Merged revision 1498808 from tomcat/trunk:
Correctly handle infinite soTimeout when disableUploadTimeout is set to false.
Patch provided by Roger Wang.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1498808
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1498811&r1=1498810&r2=1498811&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Tue Jul 2 07:30:18 2013
@@ -1082,7 +1082,11 @@ public abstract class AbstractHttp11Proc
}
if (!disableUploadTimeout) {
-setSocketTimeout(endpoint.getSoTimeout());
+if(endpoint.getSoTimeout() > 0) {
+setSocketTimeout(endpoint.getSoTimeout());
+} else {
+setSocketTimeout(0);
+}
}
rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
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=1498811&r1=1498810&r2=1498811&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jul 2 07:30:18 2013
@@ -147,8 +147,15 @@
- 55177: Correctly handle infinite soTimeout for BIO HTTP
- connector. Based on a patch by Nick Bunn. (markt)
+
+55177: Correctly handle infinite soTimeout for BIO HTTP
+connector. Based on a patch by Nick Bunn. (markt)
+
+
+55180: Correctly handle infinite soTimeout when
+disableUploadTimeout is set to false. Patch provided by
+Roger Wang. (violetagg)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55180] connectionTimeout="-1" causes timeout can't be negative
https://issues.apache.org/bugzilla/show_bug.cgi?id=55180 Violeta Georgieva changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #2 from Violeta Georgieva --- Hi, Thanks for the report and the patch. It was applied to trunk and 7.0.x and will be included in 7.0.42 onwards. For the second problem you are facing Bug 55160. Instead of connectionUploadTimeout, connectionTimeout was set as readTimeout. Regards Violeta -- 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 propchange: r1498808 - svn:log
Author: violetagg Revision: 1498808 Modified property: svn:log Modified: svn:log at Tue Jul 2 07:43:14 2013 -- --- svn:log (original) +++ svn:log Tue Jul 2 07:43:14 2013 @@ -1,3 +1,3 @@ Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55180 Correctly handle infinite soTimeout when disableUploadTimeout is set to false. -Patch provided by Roger Wang. +Patch provided by Nick Bunn. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1498811 - svn:log
Author: violetagg Revision: 1498811 Modified property: svn:log Modified: svn:log at Tue Jul 2 07:43:53 2013 -- --- svn:log (original) +++ svn:log Tue Jul 2 07:43:53 2013 @@ -1,4 +1,4 @@ Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55180 Merged revision 1498808 from tomcat/trunk: Correctly handle infinite soTimeout when disableUploadTimeout is set to false. -Patch provided by Roger Wang. +Patch provided by Nick Bunn. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1498814 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Jul 2 07:47:08 2013 New Revision: 1498814 URL: http://svn.apache.org/r1498814 Log: Correct changelog Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml 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=1498814&r1=1498813&r2=1498814&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jul 2 07:47:08 2013 @@ -154,7 +154,7 @@ 55180: Correctly handle infinite soTimeout when disableUploadTimeout is set to false. Patch provided by -Roger Wang. (violetagg) +Nick Bunn. (violetagg) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1498816 - in /tomcat/tags/TOMCAT_7_0_42: ./ build.properties.default
Author: markt Date: Tue Jul 2 07:53:39 2013 New Revision: 1498816 URL: http://svn.apache.org/r1498816 Log: Tag 7.0.42 Added: tomcat/tags/TOMCAT_7_0_42/ (props changed) - copied from r1498814, tomcat/tc7.0.x/trunk/ Modified: tomcat/tags/TOMCAT_7_0_42/build.properties.default Propchange: tomcat/tags/TOMCAT_7_0_42/ -- bugtraq:append = false Propchange: tomcat/tags/TOMCAT_7_0_42/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tags/TOMCAT_7_0_42/ -- --- bugtraq:message (added) +++ bugtraq:message Tue Jul 2 07:53:39 2013 @@ -0,0 +1 @@ +Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tags/TOMCAT_7_0_42/ -- bugtraq:number = true Propchange: tomcat/tags/TOMCAT_7_0_42/ -- bugtraq:url = https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tags/TOMCAT_7_0_42/ -- bugtraq:warnifnoissue = false Propchange: tomcat/tags/TOMCAT_7_0_42/ -- --- svn:ignore (added) +++ svn:ignore Tue Jul 2 07:53:39 2013 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tags/TOMCAT_7_0_42/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Jul 2 07:53:39 2013 @@ -0,0 +1 @@ +/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-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1352661,1 352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,13548
svn commit: r1498817 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_42: ./ build.properties.default
Author: markt Date: Tue Jul 2 07:54:21 2013 New Revision: 1498817 URL: http://svn.apache.org/r1498817 Log: Tag 7.0.42 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_42/ (props changed) - copied from r1498814, tomcat/tc7.0.x/trunk/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_42/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_42/ -- bugtraq:append = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_42/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_42/ -- --- bugtraq:message (added) +++ bugtraq:message Tue Jul 2 07:54:21 2013 @@ -0,0 +1 @@ +Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_42/ -- bugtraq:number = true Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_42/ -- bugtraq:url = https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_42/ -- bugtraq:warnifnoissue = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_42/ -- --- svn:ignore (added) +++ svn:ignore Tue Jul 2 07:54:21 2013 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_42/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Jul 2 07:54:21 2013 @@ -0,0 +1 @@ +/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-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1352661,1 352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,13537
svn commit: r1498818 - /tomcat/tags/TOMCAT_7_0_42/
Author: markt Date: Tue Jul 2 07:54:44 2013 New Revision: 1498818 URL: http://svn.apache.org/r1498818 Log: Saved tag in wrong place Removed: tomcat/tags/TOMCAT_7_0_42/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55181] New: Ping and Pong messages should have identical application data
https://issues.apache.org/bugzilla/show_bug.cgi?id=55181 Bug ID: 55181 Summary: Ping and Pong messages should have identical application data Product: Tomcat 8 Version: trunk Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: nick...@gmail.com Created attachment 30520 --> https://issues.apache.org/bugzilla/attachment.cgi?id=30520&action=edit PingPongMessages.patch As described in RFC 6455 Ping and Pong should have identical application data. http://tools.ietf.org/html/rfc6455#section-5.5.3 Current implementation can return application data ByteBuffer with extra bytes hence have different length from "ping" message which means that those are not identical. Here is a patch + test case cheers niki -- 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 55181] Ping and Pong messages should have identical application data
https://issues.apache.org/bugzilla/show_bug.cgi?id=55181 Niki Dokovski changed: What|Removed |Added Attachment #30520|0 |1 is patch|| -- 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: r1498820 - in /tomcat/trunk/java/org/apache/catalina/tribes/tipis: AbstractReplicatedMap.java LazyReplicatedMap.java ReplicatedMap.java
Author: kfujino
Date: Tue Jul 2 08:11:52 2013
New Revision: 1498820
URL: http://svn.apache.org/r1498820
Log:
Ensure the application will start even if replication map fails to start.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
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=1498820&r1=1498819&r2=1498820&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Tue Jul 2 08:11:52 2013
@@ -172,9 +172,10 @@ public abstract class AbstractReplicated
int initialCapacity,
float loadFactor,
int channelSendOptions,
- ClassLoader[] cls) {
+ ClassLoader[] cls,
+ boolean terminate) {
innerMap = new ConcurrentHashMap<>(initialCapacity, loadFactor, 15);
-init(owner, channel, mapContextName, timeout, channelSendOptions, cls);
+init(owner, channel, mapContextName, timeout, channelSendOptions, cls,
terminate);
}
@@ -198,7 +199,8 @@ public abstract class AbstractReplicated
* @param channelSendOptions int
* @param cls ClassLoader[]
*/
-protected void init(MapOwner owner, Channel channel, String
mapContextName, long timeout, int channelSendOptions,ClassLoader[] cls) {
+protected void init(MapOwner owner, Channel channel, String mapContextName,
+long timeout, int channelSendOptions,ClassLoader[] cls, boolean
terminate) {
log.info("Initializing AbstractReplicatedMap with context
name:"+mapContextName);
this.mapOwner = owner;
this.externalLoaders = cls;
@@ -228,11 +230,13 @@ public abstract class AbstractReplicated
broadcast(MapMessage.MSG_START, true);
} catch (ChannelException x) {
log.warn("Unable to send map start message.");
-// remove listener from channel
-this.rpcChannel.breakdown();
-this.channel.removeChannelListener(this);
-this.channel.removeMembershipListener(this);
-throw new RuntimeException("Unable to start replicated map.",x);
+if (terminate) {
+// remove listener from channel
+this.rpcChannel.breakdown();
+this.channel.removeChannelListener(this);
+this.channel.removeMembershipListener(this);
+throw new RuntimeException("Unable to start replicated
map.",x);
+}
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=1498820&r1=1498819&r2=1498820&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
Tue Jul 2 08:11:52 2013
@@ -80,7 +80,7 @@ public class LazyReplicatedMap exte
* @param loadFactor float - load factor, see HashMap
*/
public LazyReplicatedMap(MapOwner owner, Channel channel, long
timeout, String mapContextName, int initialCapacity, float loadFactor,
ClassLoader[] cls) {
-
super(owner,channel,timeout,mapContextName,initialCapacity,loadFactor,
Channel.SEND_OPTIONS_DEFAULT,cls);
+
super(owner,channel,timeout,mapContextName,initialCapacity,loadFactor,
Channel.SEND_OPTIONS_DEFAULT,cls, true);
}
/**
@@ -91,7 +91,7 @@ public class LazyReplicatedMap exte
* @param initialCapacity int - the size of this map, see HashMap
*/
public LazyReplicatedMap(MapOwner owner, Channel channel, long
timeout, String mapContextName, int initialCapacity, ClassLoader[] cls) {
-super(owner, channel,timeout,mapContextName,initialCapacity,
AbstractReplicatedMap.DEFAULT_LOAD_FACTOR, Channel.SEND_OPTIONS_DEFAULT, cls);
+super(owner, channel,timeout,mapContextName,initialCapacity,
AbstractReplicatedMap.DEFAULT_LOAD_FACTOR, Channel.SEND_OPTIONS_DEFAULT, cls,
true);
}
/**
@@ -101,7 +101,19 @@ public class LazyReplicatedMap exte
* @param mapContextName String - unique name for this map, to allow
multiple maps per channel
*/
public LazyReplica
svn commit: r1498822 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
Author: kfujino
Date: Tue Jul 2 08:16:18 2013
New Revision: 1498822
URL: http://svn.apache.org/r1498822
Log:
Fix indent.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=1498822&r1=1498821&r2=1498822&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
Tue Jul 2 08:16:18 2013
@@ -72,49 +72,49 @@ public class LazyReplicatedMap exte
// CONSTRUCTORS / DESTRUCTORS
//--
/**
- * Creates a new map
- * @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
- * @param mapContextName String - unique name for this map, to allow
multiple maps per channel
- * @param initialCapacity int - the size of this map, see HashMap
- * @param loadFactor float - load factor, see HashMap
- */
-public LazyReplicatedMap(MapOwner owner, Channel channel, long
timeout, String mapContextName, int initialCapacity, float loadFactor,
ClassLoader[] cls) {
-
super(owner,channel,timeout,mapContextName,initialCapacity,loadFactor,
Channel.SEND_OPTIONS_DEFAULT,cls, true);
-}
-
-/**
- * Creates a new map
- * @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
- * @param mapContextName String - unique name for this map, to allow
multiple maps per channel
- * @param initialCapacity int - the size of this map, see HashMap
- */
-public LazyReplicatedMap(MapOwner owner, Channel channel, long
timeout, String mapContextName, int initialCapacity, ClassLoader[] cls) {
-super(owner, channel,timeout,mapContextName,initialCapacity,
AbstractReplicatedMap.DEFAULT_LOAD_FACTOR, Channel.SEND_OPTIONS_DEFAULT, cls,
true);
-}
-
-/**
- * Creates a new map
- * @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
- * @param mapContextName String - unique name for this map, to allow
multiple maps per channel
- */
-public LazyReplicatedMap(MapOwner owner, Channel channel, long
timeout, String mapContextName, ClassLoader[] cls) {
-super(owner, channel,timeout,mapContextName,
AbstractReplicatedMap.DEFAULT_INITIAL_CAPACITY,AbstractReplicatedMap.DEFAULT_LOAD_FACTOR,Channel.SEND_OPTIONS_DEFAULT,
cls, true);
-}
-
-/**
- * Creates a new map
- * @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
- * @param mapContextName String - unique name for this map, to allow
multiple maps per channel
- * @param terminate boolean - Flag for whether to terminate this map
that failed to start.
- */
-public LazyReplicatedMap(MapOwner owner, Channel channel, long
timeout, String mapContextName, ClassLoader[] cls, boolean terminate) {
-super(owner, channel,timeout,mapContextName,
AbstractReplicatedMap.DEFAULT_INITIAL_CAPACITY,
-
AbstractReplicatedMap.DEFAULT_LOAD_FACTOR,Channel.SEND_OPTIONS_DEFAULT, cls,
terminate);
-}
+ * Creates a new map
+ * @param channel The channel to use for communication
+ * @param timeout long - timeout for RPC messags
+ * @param mapContextName String - unique name for this map, to allow
multiple maps per channel
+ * @param initialCapacity int - the size of this map, see HashMap
+ * @param loadFactor float - load factor, see HashMap
+ */
+public LazyReplicatedMap(MapOwner owner, Channel channel, long timeout,
String mapContextName, int initialCapacity, float loadFactor, ClassLoader[]
cls) {
+super(owner,channel,timeout,mapContextName,initialCapacity,loadFactor,
Channel.SEND_OPTIONS_DEFAULT,cls, true);
+}
+
+/**
+ * Creates a new map
+ * @param channel The channel to use for communication
+ * @param timeout long - timeout for RPC messags
+ * @param mapContextName String - unique name for this map, to allow
multiple maps per channel
+ * @param initialCapacity int - the size of this map, see HashMap
+ */
+public LazyReplicatedMap(MapOwner owner, Channel channel, long timeout,
String mapContextName, int initialCapacity, ClassLoader[] cls) {
+super(owner, channel,timeout,mapContextName,initialCapacity,
AbstractReplicatedMap.DEFAULT_LOAD_FACTOR, Channel.SEND_OPTIONS_DEFAULT, cls,
true);
+}
+
+/
svn commit: r1498826 - /tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
Author: kfujino
Date: Tue Jul 2 08:23:26 2013
New Revision: 1498826
URL: http://svn.apache.org/r1498826
Log:
Add new attribute terminateOnStartFailure.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1498826&r1=1498825&r2=1498826&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java Tue Jul
2 08:23:26 2013
@@ -70,6 +70,11 @@ public class BackupManager extends Clust
private long rpcTimeout = DEFAULT_REPL_TIMEOUT;
/**
+ * Flag for whether to terminate this map that failed to start.
+ */
+private boolean terminateOnStartFailure = false;
+
+/**
* Constructor, just calls super()
*
*/
@@ -163,7 +168,7 @@ public class BackupManager extends Clust
cluster.registerManager(this);
LazyReplicatedMap map = new LazyReplicatedMap<>(
this, cluster.getChannel(), rpcTimeout, getMapName(),
-getClassLoaders());
+getClassLoaders(), terminateOnStartFailure);
map.setChannelSendOptions(mapSendOptions);
this.sessions = map;
} catch ( Exception x ) {
@@ -234,6 +239,14 @@ public class BackupManager extends Clust
return rpcTimeout;
}
+public void setTerminateOnStartFailure(boolean terminateOnStartFailure) {
+this.terminateOnStartFailure = terminateOnStartFailure;
+}
+
+public boolean isTerminateOnStartFailure() {
+return terminateOnStartFailure;
+}
+
@Override
public String[] getInvalidatedSessions() {
return new String[0];
@@ -246,6 +259,7 @@ public class BackupManager extends Clust
result.mExpireSessionsOnShutdown = mExpireSessionsOnShutdown;
result.mapSendOptions = mapSendOptions;
result.rpcTimeout = rpcTimeout;
+result.terminateOnStartFailure = terminateOnStartFailure;
return result;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1498827 - in /tomcat/trunk: java/org/apache/tomcat/websocket/WsPongMessage.java test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
Author: markt
Date: Tue Jul 2 08:26:28 2013
New Revision: 1498827
URL: http://svn.apache.org/r1498827
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55181
Protect against clients that ignore the limit of the byte buffer
Added:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
(with props)
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsPongMessage.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsPongMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsPongMessage.java?rev=1498827&r1=1498826&r2=1498827&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsPongMessage.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsPongMessage.java Tue Jul 2
08:26:28 2013
@@ -26,7 +26,9 @@ public class WsPongMessage implements Po
public WsPongMessage(ByteBuffer applicationData) {
-this.applicationData = applicationData;
+byte[] dst = new byte[applicationData.limit()];
+applicationData.get(dst);
+this.applicationData = ByteBuffer.wrap(dst);
}
Added: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java?rev=1498827&view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
(added)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
Tue Jul 2 08:26:28 2013
@@ -0,0 +1,100 @@
+/*
+ * 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;
+
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.websocket.ClientEndpointConfig;
+import javax.websocket.ContainerProvider;
+import javax.websocket.PongMessage;
+import javax.websocket.Session;
+import javax.websocket.WebSocketContainer;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.deploy.ApplicationListener;
+import org.apache.catalina.servlets.DefaultServlet;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.websocket.TesterSingleMessageClient.TesterEndpoint;
+import
org.apache.tomcat.websocket.TesterSingleMessageClient.TesterProgrammaticEndpoint;
+
+
+public class TestWsPingPongMessages extends TomcatBaseTest {
+
+ByteBuffer applicationData = ByteBuffer.wrap(new String("mydata")
+.getBytes());
+
+@Test
+public void testPingPongMessages() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+// Must have a real docBase - just use temp
+Context ctx = tomcat.addContext("",
+System.getProperty("java.io.tmpdir"));
+ctx.addApplicationListener(new ApplicationListener(
+TesterEchoServer.Config.class.getName(), false));
+
+Tomcat.addServlet(ctx, "default", new DefaultServlet());
+ctx.addServletMapping("/", "default");
+
+tomcat.start();
+
+WebSocketContainer wsContainer = ContainerProvider
+.getWebSocketContainer();
+
+tomcat.start();
+
+Session wsSession = wsContainer.connectToServer(
+TesterProgrammaticEndpoint.class, ClientEndpointConfig.Builder
+.create().build(), new URI("ws://localhost:"
++ getPort() + TesterEchoServer.Config.PATH_ASYNC));
+
+CountDownLatch latch = new CountDownLatch(1);
+TesterEndpoint tep = (TesterEndpoint) wsSession.getUserProperties()
+.get("endpoint");
+tep.setLatch(latch);
+
+PongMessageHandler handler = new PongMessageHandler(latch);
+wsSession.addMessageHandler(handler);
+wsSession.getBasicRemote().sendPing(applicationData);
+
+boolean latchResult = handler.getLatch().await(10, TimeUnit.SECONDS);
+Assert.ass
[Bug 55181] Ping and Pong messages should have identical application data
https://issues.apache.org/bugzilla/show_bug.cgi?id=55181 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Mark Thomas --- Arguably what the test case is demonstrating is a client bug since the client should not ignore the limit on the byte buffer. That said, that patch does make the implementation more robust so I have applied it to trunk. Thanks for the report. -- 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: r1498828 - /tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
Author: kfujino Date: Tue Jul 2 08:29:49 2013 New Revision: 1498828 URL: http://svn.apache.org/r1498828 Log: Expose terminateOnStartFailure via JMX. Modified: tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Modified: tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1498828&r1=1498827&r2=1498828&view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Tue Jul 2 08:29:49 2013 @@ -515,6 +515,11 @@ description="Timeout for RPC messages, how long we will wait for a reply" type="long"/> + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1498835 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Author: kfujino
Date: Tue Jul 2 08:39:02 2013
New Revision: 1498835
URL: http://svn.apache.org/r1498835
Log:
Make sure that terminate replication map.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
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=1498835&r1=1498834&r2=1498835&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Tue Jul 2 08:39:02 2013
@@ -231,10 +231,7 @@ public abstract class AbstractReplicated
} catch (ChannelException x) {
log.warn("Unable to send map start message.");
if (terminate) {
-// remove listener from channel
-this.rpcChannel.breakdown();
-this.channel.removeChannelListener(this);
-this.channel.removeMembershipListener(this);
+breakdown();
throw new RuntimeException("Unable to start replicated
map.",x);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1498843 - /tomcat/trunk/webapps/docs/config/cluster-manager.xml
Author: kfujino Date: Tue Jul 2 08:51:59 2013 New Revision: 1498843 URL: http://svn.apache.org/r1498843 Log: Add document of terminateOnStartFailure. Modified: tomcat/trunk/webapps/docs/config/cluster-manager.xml Modified: tomcat/trunk/webapps/docs/config/cluster-manager.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-manager.xml?rev=1498843&r1=1498842&r2=1498843&view=diff == --- tomcat/trunk/webapps/docs/config/cluster-manager.xml (original) +++ tomcat/trunk/webapps/docs/config/cluster-manager.xml Tue Jul 2 08:51:59 2013 @@ -146,6 +146,13 @@ another map. Default value is 15000 milliseconds. + +Set to true if you wish to terminate replication map when replication +map fails to start. If replication map is terminated, associated context +will fail to start. If you set this attribute to false, replication map +does not end. It will try to join the map membership in the heartbeat. +Default value is false . + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 7.0.42
The proposed Apache Tomcat 7.0.42 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.42/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-098/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_42/ The proposed 7.0.42 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.42 Stable Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1498853 - /tomcat/trunk/test/webapp/WEB-INF/web.xml
Author: markt Date: Tue Jul 2 09:35:07 2013 New Revision: 1498853 URL: http://svn.apache.org/r1498853 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55162 Fix namespace Patch provided by Jeremy Boynes Modified: tomcat/trunk/test/webapp/WEB-INF/web.xml Modified: tomcat/trunk/test/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/web.xml?rev=1498853&r1=1498852&r2=1498853&view=diff == --- tomcat/trunk/test/webapp/WEB-INF/web.xml (original) +++ tomcat/trunk/test/webapp/WEB-INF/web.xml Tue Jul 2 09:35:07 2013 @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://java.sun.com/xml/ns/javaee"; +http://xmlns.jcp.org/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_3_1.xsd"; + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee + http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"; version="3.1" metadata-complete="true"> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55162] Incorrect namespace URI test webapp
https://issues.apache.org/bugzilla/show_bug.cgi?id=55162 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas --- Thanks for the report and the patch. This has been fixed in trunk. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1498855 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/ha/session/ java/org/apache/catalina/tribes/tipis/ webapps/docs/ webapps/docs/config/
Author: kfujino
Date: Tue Jul 2 09:37:08 2013
New Revision: 1498855
URL: http://svn.apache.org/r1498855
Log:
Add new attribute terminateOnStartFailure in BackupManaber.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-manager.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1498855&r1=1498854&r2=1498855&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
Tue Jul 2 09:37:08 2013
@@ -70,6 +70,11 @@ public class BackupManager extends Clust
private long rpcTimeout = DEFAULT_REPL_TIMEOUT;
/**
+ * Flag for whether to terminate this map that failed to start.
+ */
+private boolean terminateOnStartFailure = false;
+
+/**
* Constructor, just calls super()
*
*/
@@ -164,7 +169,8 @@ public class BackupManager extends Clust
cluster.getChannel(),
rpcTimeout,
getMapName(),
- getClassLoaders());
+ getClassLoaders(),
+
terminateOnStartFailure);
map.setChannelSendOptions(mapSendOptions);
this.sessions = map;
} catch ( Exception x ) {
@@ -234,6 +240,14 @@ public class BackupManager extends Clust
return rpcTimeout;
}
+public void setTerminateOnStartFailure(boolean terminateOnStartFailure) {
+this.terminateOnStartFailure = terminateOnStartFailure;
+}
+
+public boolean isTerminateOnStartFailure() {
+return terminateOnStartFailure;
+}
+
@Override
public String[] getInvalidatedSessions() {
return new String[0];
@@ -246,6 +260,7 @@ public class BackupManager extends Clust
result.mExpireSessionsOnShutdown = mExpireSessionsOnShutdown;
result.mapSendOptions = mapSendOptions;
result.rpcTimeout = rpcTimeout;
+result.terminateOnStartFailure = terminateOnStartFailure;
return result;
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1498855&r1=1498854&r2=1498855&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
Tue Jul 2 09:37:08 2013
@@ -542,6 +542,11 @@
description="Timeout for RPC messages, how long we will wait for a reply"
type="long"/>
+
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=1498855&r1=1498854&r2=1498855&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
Tue Jul 2 09:37:08 2013
@@ -171,9 +171,10 @@ public abstract class AbstractReplicated
int initialCapacity,
float loadFactor,
int channelSendOptions,
- ClassLoader[] cls) {
+ ClassLoader[] cls,
+ boolean terminate) {
super(initialCapacity, loadFactor, 15);
-init(owner, channel, mapContextName, timeout, channelSendOptions, cls);
+init(owner, channel, mapContextName, timeout, channelSendOptions, cls,
terminate);
}
@@ -197,7 +198,8 @@ public abstract class AbstractReplicated
* @param channelSendOptions int
* @param cls ClassLoader[]
*/
-pr
svn commit: r1498856 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Jul 2 09:38:31 2013 New Revision: 1498856 URL: http://svn.apache.org/r1498856 Log: Update 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=1498856&r1=1498855&r2=1498856&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul 2 09:38:31 2013 @@ -52,7 +52,7 @@ Implement JSR 340 - Servlet 3.1. The JSR 340 implementation includes -contributions from Nick Williams. (markt) +contributions from Nick Williams and Jeremy Boynes. (markt) Implement JSR 356 - WebSockets. The JSR 356 implementation includes - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1498857 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Author: markt Date: Tue Jul 2 09:40:26 2013 New Revision: 1498857 URL: http://svn.apache.org/r1498857 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55165 Ensure sub-protocols are processed for annotated endpoint. Patch provided by Niki Dokovski. Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1498857&r1=1498856&r2=1498857&view=diff == --- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java Tue Jul 2 09:40:26 2013 @@ -235,6 +235,7 @@ public class WsServerContainer extends W sec = ServerEndpointConfig.Builder.create(pojo, path). decoders(Arrays.asList(annotation.decoders())). encoders(Arrays.asList(annotation.encoders())). +subprotocols(Arrays.asList(annotation.subprotocols())). configurator(configurator). build(); sec.getUserProperties().put( - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55165] subprotocols not available with annotated serverendpoint
https://issues.apache.org/bugzilla/show_bug.cgi?id=55165 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- Thanks for the report and the patch. The patch has been applied to trunk. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55166] schemaLocation references between servlet and jsp XSDs are invalid
https://issues.apache.org/bugzilla/show_bug.cgi?id=55166 --- Comment #4 from Mark Thomas --- Do you still see the issue if both the servlet-api.jar and jsp-api.jar are available on the class path? I'd expect the answer to be no since the TCK tests run with validation enabled for the XML parser and there are no issues resolving the various schemas. -- 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 55166] schemaLocation references between servlet and jsp XSDs are invalid
https://issues.apache.org/bugzilla/show_bug.cgi?id=55166 Mark Thomas changed: What|Removed |Added Status|REOPENED|NEEDINFO -- 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: r1498868 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Author: markt
Date: Tue Jul 2 10:21:53 2013
New Revision: 1498868
URL: http://svn.apache.org/r1498868
Log:
Line length
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1498868&r1=1498867&r2=1498868&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Tue Jul 2 10:21:53 2013
@@ -235,7 +235,8 @@ public class TestWsWebSocketContainer ex
tomcat.start();
-Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
+Session wsSession = wsContainer.connectToServer(
+TesterProgrammaticEndpoint.class,
ClientEndpointConfig.Builder.create().build(),
new URI("ws://localhost:" + getPort() +
TesterEchoServer.Config.PATH_BASIC));
@@ -323,7 +324,8 @@ public class TestWsWebSocketContainer ex
tomcat.start();
-Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
+Session wsSession = wsContainer.connectToServer(
+TesterProgrammaticEndpoint.class,
ClientEndpointConfig.Builder.create().build(),
new URI("ws://localhost:" + getPort() + BlockingConfig.PATH));
@@ -406,7 +408,8 @@ public class TestWsWebSocketContainer ex
tomcat.start();
-Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
+Session wsSession = wsContainer.connectToServer(
+TesterProgrammaticEndpoint.class,
ClientEndpointConfig.Builder.create().build(),
new URI("ws://localhost:" + getPort() +
ConstantTxConfig.PATH));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-127) tomcat:run - Configuring Logging with JULI
[ https://issues.apache.org/jira/browse/MTOMCAT-127?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13697690#comment-13697690 ] Pablo Karlsson commented on MTOMCAT-127: I have the same problem. It would nice to see this fixed because since tomcat 7 all jars are Scanned for TLDs by tomcat and logging of which jars that has been scanned would help a lot in determining witch jars to skip in this scan. > tomcat:run - Configuring Logging with JULI > --- > > Key: MTOMCAT-127 > URL: https://issues.apache.org/jira/browse/MTOMCAT-127 > Project: Apache Tomcat Maven Plugin > Issue Type: New Feature > Components: tomcat6, tomcat7 >Affects Versions: 2.0 >Reporter: Cédric Couralet >Assignee: Olivier Lamy (*$^¨%`£) >Priority: Minor > Fix For: backlog > > > The configuration for a custom logging.properties is not taken into account > with the tomcat6-7:run goal. > From what I've seen, the reason is that the configuration for > java.util.logging is done before setting the system properties in the same > class loader. > I think it could be fixed by putting a call to > LogManager.getLogManager().readConfiguration(); right after setting the > system properties. I'm not confident enough on the possible side effects to > say it is the best solution. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-127) tomcat:run - Configuring Logging with JULI
[ https://issues.apache.org/jira/browse/MTOMCAT-127?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13697693#comment-13697693 ] Olivier Lamy (*$^¨%`£) commented on MTOMCAT-127: do you have any sample project? > tomcat:run - Configuring Logging with JULI > --- > > Key: MTOMCAT-127 > URL: https://issues.apache.org/jira/browse/MTOMCAT-127 > Project: Apache Tomcat Maven Plugin > Issue Type: New Feature > Components: tomcat6, tomcat7 >Affects Versions: 2.0 >Reporter: Cédric Couralet >Assignee: Olivier Lamy (*$^¨%`£) >Priority: Minor > Fix For: backlog > > > The configuration for a custom logging.properties is not taken into account > with the tomcat6-7:run goal. > From what I've seen, the reason is that the configuration for > java.util.logging is done before setting the system properties in the same > class loader. > I think it could be fixed by putting a call to > LogManager.getLogManager().readConfiguration(); right after setting the > system properties. I'm not confident enough on the possible side effects to > say it is the best solution. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55171] [jsr 356] All server threads become blocked after some websocket testing
https://issues.apache.org/bugzilla/show_bug.cgi?id=55171 Mark Thomas changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas --- Thanks for the report and the stack trace. It appears that there are multiple issues here. So far I have identified: 1. Upgraded connection not marked as upgraded early enough and poller events are processed as if they were for a new connection. 2. Connections closed by the client are not recognised as being closed by the WebSocket implementation. I have a fix for 1 that I'll commit shortly. I'm still looking into 2. -- 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: r1498896 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java http11/upgrade/AbstractProcessor.java
Author: markt
Date: Tue Jul 2 12:02:25 2013
New Revision: 1498896
URL: http://svn.apache.org/r1498896
Log:
Upgraded connections need to be marked as upgraded earlier so any poller events
triggered are passed to the upgrade processor.
The call to WebConnection.init() needs to occur after the connection has been
marked as upgraded to ensure that any events triggered by the init() code are
processed as part of the upgraded connection.
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1498896&r1=1498895&r2=1498896&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Tue Jul 2
12:02:25 2013
@@ -30,6 +30,7 @@ import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import javax.servlet.http.HttpUpgradeHandler;
+import javax.servlet.http.WebConnection;
import org.apache.juli.logging.Log;
import org.apache.tomcat.util.ExceptionUtils;
@@ -636,10 +637,20 @@ public abstract class AbstractProtocol i
processor.getHttpUpgradeHandler();
// Release the Http11 processor to be re-used
release(wrapper, processor, false, false);
-// Create the light-weight upgrade processor
+// Create the upgrade processor
processor = createUpgradeProcessor(
wrapper, httpUpgradeHandler);
+// Mark the connection as upgraded
wrapper.setUpgraded(true);
+// Associate with the processor with the connection
+connections.put(socket, processor);
+// Initialise the upgrade handler (which may trigger
+// some IO using the new protocol which is why the
lines
+// above are necessary)
+// This cast should be safe. If it fails the error
+// handling for the surrounding try/catch will deal
with
+// it.
+httpUpgradeHandler.init((WebConnection) processor);
}
if (getLog().isDebugEnabled()) {
getLog().debug("Socket: [" + wrapper +
@@ -667,8 +678,6 @@ public abstract class AbstractProtocol i
connections.remove(socket);
release(wrapper, processor, false, false);
} else if (state == SocketState.UPGRADED) {
-// Need to keep the connection associated with the
processor
-connections.put(socket, processor);
// Don't add sockets back to the poller if this was a
// non-blocking write otherwise the poller may trigger
// multiple read events which may lead to thread starvation
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java?rev=1498896&r1=1498895&r2=1498896&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java
Tue Jul 2 12:02:25 2013
@@ -48,7 +48,6 @@ public abstract class AbstractProcessor<
this.httpUpgradeHandler = httpUpgradeHandler;
this.upgradeServletInputStream = upgradeServletInputStream;
this.upgradeServletOutputStream = upgradeServletOutputStream;
-this.httpUpgradeHandler.init(this);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55183] New: Missing WS Protocol Header in session negotiatedHeaders
https://issues.apache.org/bugzilla/show_bug.cgi?id=55183 Bug ID: 55183 Summary: Missing WS Protocol Header in session negotiatedHeaders Product: Tomcat 8 Version: trunk Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: nick...@gmail.com Created attachment 30524 --> https://issues.apache.org/bugzilla/attachment.cgi?id=30524&action=edit patch in WsWebSocketContainer There is case sensitive check for ws protocol header name in WsWebSocketContainer Here is a fix and a test case checking subprotocol negotiation -- 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 55183] Missing WS Protocol Header in session negotiatedHeaders
https://issues.apache.org/bugzilla/show_bug.cgi?id=55183 Niki Dokovski changed: What|Removed |Added Attachment #30524|0 |1 is patch|| -- 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: r1498903 - /tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Author: markt
Date: Tue Jul 2 12:27:39 2013
New Revision: 1498903
URL: http://svn.apache.org/r1498903
Log:
Fix comment typo
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=1498903&r1=1498902&r2=1498903&view=diff
==
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Tue Jul 2 12:27:39 2013
@@ -108,7 +108,7 @@ public abstract class AbstractServletOut
} else {
// Non-blocking IO
// If the non-blocking read does not complete, doWrite() will add
-// the socket back into the poller. The poller way trigger a new
+// the socket back into the poller. The poller may trigger a new
// write event before this method has finished updating buffer. The
// writeLock sync makes sure that buffer is updated before the next
// write executes.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55184] New: NPE in PojoMethodMapping getMessageHandler
https://issues.apache.org/bugzilla/show_bug.cgi?id=55184 Bug ID: 55184 Summary: NPE in PojoMethodMapping getMessageHandler Product: Tomcat 8 Version: trunk Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: nick...@gmail.com Created attachment 30525 --> https://issues.apache.org/bugzilla/attachment.cgi?id=30525&action=edit PojoMethodMapping.patch A check for null value is missed. Here is the patch -- 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: r1498920 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Author: markt
Date: Tue Jul 2 13:20:59 2013
New Revision: 1498920
URL: http://svn.apache.org/r1498920
Log:
Refactor
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1498920&r1=1498919&r2=1498920&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Tue Jul 2 13:20:59 2013
@@ -106,9 +106,7 @@ public class WsRemoteEndpointImplServer
} catch (IOException ioe) {
wsWriteTimeout.unregister(this);
close();
-SendHandler sh = handler;
-handler = null;
-sh.onResult(new SendResult(ioe));
+clearHandler(ioe);
}
if (!complete) {
// Async write is in progress
@@ -143,7 +141,13 @@ public class WsRemoteEndpointImplServer
protected void onTimeout() {
close();
-handler.onResult(new SendResult(new SocketTimeoutException()));
+clearHandler(new SocketTimeoutException());
+}
+
+
+private void clearHandler(Throwable t) {
+SendHandler sh = handler;
handler = null;
+sh.onResult(new SendResult(t));
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1498924 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Author: markt
Date: Tue Jul 2 13:23:05 2013
New Revision: 1498924
URL: http://svn.apache.org/r1498924
Log:
More refactoring
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1498924&r1=1498923&r2=1498924&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Tue Jul 2 13:23:05 2013
@@ -96,9 +96,7 @@ public class WsRemoteEndpointImplServer
// could update the value of the handler. Therefore, keep a
// local copy before signalling the end of the (partial)
// message.
-SendHandler sh = handler;
-handler = null;
-sh.onResult(new SendResult());
+clearHandler(null);
break;
}
}
@@ -148,6 +146,10 @@ public class WsRemoteEndpointImplServer
private void clearHandler(Throwable t) {
SendHandler sh = handler;
handler = null;
-sh.onResult(new SendResult(t));
+if (t == null) {
+sh.onResult(new SendResult());
+} else {
+sh.onResult(new SendResult(t));
+}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1498929 - in /tomcat/trunk/java/org/apache: coyote/http11/upgrade/ tomcat/websocket/ tomcat/websocket/server/
Author: markt
Date: Tue Jul 2 13:27:46 2013
New Revision: 1498929
URL: http://svn.apache.org/r1498929
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55171
If the client closed the connection, the write of any remainign data in the
buffer in AbstractServletOutputStream would fail but the remote endpoint was
not notified. This meant that blocking writes would block for ever eventually
locking up the entire server.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.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=1498929&r1=1498928&r2=1498929&view=diff
==
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Tue Jul 2 13:27:46 2013
@@ -21,6 +21,7 @@ import java.io.IOException;
import javax.servlet.ServletOutputStream;
import javax.servlet.WriteListener;
+import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
public abstract class AbstractServletOutputStream extends ServletOutputStream {
@@ -127,7 +128,17 @@ public abstract class AbstractServletOut
protected final void onWritePossible() throws IOException {
synchronized (writeLock) {
-writeInternal(buffer, 0, buffer.length);
+try {
+writeInternal(buffer, 0, buffer.length);
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+listener.onError(t);
+if (t instanceof IOException) {
+throw t;
+} else {
+throw new IOException(t);
+}
+}
// Make sure isReady() and onWritePossible() have a consistent view
of
// buffer and fireListener when determining if the listener should
fire
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=1498929&r1=1498928&r2=1498929&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Tue Jul 2 13:27:46 2013
@@ -492,7 +492,7 @@ public abstract class WsRemoteEndpointIm
}
-protected final void close() {
+public final void close() {
for (EncoderEntry entry : encoderEntries) {
entry.getEncoder().destroy();
}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java?rev=1498929&r1=1498928&r2=1498929&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
Tue Jul 2 13:27:46 2013
@@ -237,6 +237,7 @@ public class WsHttpUpgradeHandler implem
@Override
public void onError(Throwable throwable) {
wsProtocolHandler.onError(throwable);
+wsRemoteEndpointServer.close();
}
}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1498929&r1=1498928&r2=1498929&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Tue Jul 2 13:27:46 2013
@@ -16,6 +16,7 @@
*/
package org.apache.tomcat.websocket.server;
+import java.io.EOFException;
import java.io.IOException;
import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
@@ -121,6 +122,9 @@ public class WsRemoteEndpointImplServer
@Override
protected void doClose() {
+if (handler != null) {
+clearHandler(new EOFException());
+}
try {
sos.close();
} catch (I
[Bug 55171] [jsr 356] All server threads become blocked after some websocket testing
https://issues.apache.org/bugzilla/show_bug.cgi?id=55171 --- Comment #2 from Mark Thomas --- I've tracked down the likely cause of 2 and have committed a fix to trunk. It would be useful to know if the issue is now resolved when running your load 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
Re: [VOTE] Release Apache Tomcat 7.0.42
Works for me on some internal applications including Jenkins 1.520. [X] Stable - go ahead and release as 7.0.42 Stable 2013/7/2 Mark Thomas > The proposed Apache Tomcat 7.0.42 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.42/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-098/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_42/ > > The proposed 7.0.42 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 7.0.42 Stable > > Cheers, > > Mark > > - > 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.42
On Tue, Jul 2, 2013 at 5:18 AM, Mark Thomas wrote: > The proposed Apache Tomcat 7.0.42 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.42/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-098/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_42/ > > The proposed 7.0.42 release is: > [ ] Broken - do not release > [ X ] Stable - go ahead and release as 7.0.42 Stable Looks good in internal testing. Yoav > > Cheers, > > 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
[Bug 55171] [jsr 356] All server threads become blocked after some websocket testing
https://issues.apache.org/bugzilla/show_bug.cgi?id=55171 --- Comment #3 from Stoyan Boshev --- I have found a way to reproduce this issue reliably with my tests. I will test the fixes and will provide feedback tomorrow. -- 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 55170] [websocket][jsr 356]Thread falls in endless cycle when connection is reset
https://issues.apache.org/bugzilla/show_bug.cgi?id=55170 Mark Thomas changed: What|Removed |Added Status|NEW |NEEDINFO OS||All --- Comment #1 from Mark Thomas --- I can't reproduce this and trying to match the line numbers with the OpenJDK source doesn't quite line up. There is nothing that jumps out at me as causing this sort of problem. All together this makes it very difficult to figure out what the problem is from source code inspection alone. Are you able to put together a test client that demonstrates this against the WebSocket examples that ship with Tomcat? Ideally without the proxy closing the connection (killing or shutting down Tomcat should have the same effect). -- 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: r1498994 - in /tomcat/trunk: java/org/apache/tomcat/websocket/Constants.java java/org/apache/tomcat/websocket/WsWebSocketContainer.java test/org/apache/tomcat/websocket/TestWsSubprotocols.
Author: markt
Date: Tue Jul 2 16:13:13 2013
New Revision: 1498994
URL: http://svn.apache.org/r1498994
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55183
Header names are case insensitive
Based on a patch by Niki Dokovski.
Added:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
(with props)
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java?rev=1498994&r1=1498993&r2=1498994&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java Tue Jul 2
16:13:13 2013
@@ -16,6 +16,8 @@
*/
package org.apache.tomcat.websocket;
+import java.util.Locale;
+
/**
* Internal implementation constants.
*/
@@ -50,6 +52,8 @@ public class Constants {
public static final String WS_KEY_HEADER_NAME = "Sec-WebSocket-Key";
public static final String WS_PROTOCOL_HEADER_NAME =
"Sec-WebSocket-Protocol";
+public static final String WS_PROTOCOL_HEADER_NAME_LOWER =
+WS_PROTOCOL_HEADER_NAME.toLowerCase(Locale.ENGLISH);
public static final String WS_EXTENSIONS_HEADER_NAME =
"Sec-WebSocket-Extensions";
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1498994&r1=1498993&r2=1498994&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Tue
Jul 2 16:13:13 2013
@@ -308,8 +308,9 @@ public class WsWebSocketContainer
afterResponse(handshakeResponse);
// Sub-protocol
+// Header names are always stored in lower case
List values = handshakeResponse.getHeaders().get(
-Constants.WS_PROTOCOL_HEADER_NAME);
+Constants.WS_PROTOCOL_HEADER_NAME_LOWER);
if (values == null || values.size() == 0) {
subProtocol = null;
} else if (values.size() == 1) {
@@ -591,6 +592,7 @@ public class WsWebSocketContainer
log.warn(sm.getString("wsWebSocketContainer.invalidHeader", line));
return;
}
+// Header names are case insensitive so always use lower case
String headerName = line.substring(0, index).trim().toLowerCase();
// TODO handle known multi-value headers
String headerValue = line.substring(index + 1).trim();
Added: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java?rev=1498994&view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
(added)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java Tue
Jul 2 16:13:13 2013
@@ -0,0 +1,121 @@
+/*
+ * 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;
+
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.servlet.ServletContextEvent;
+import javax.websocket.ClientEndpointConfig;
+import javax.websocket.ContainerProvider;
+import javax.websocket.DeploymentException;
+import javax.websocket.EndpointConfig;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.WebSocketContainer;
+import javax.websocket.server.ServerContainer;
+import javax.websocket.server.ServerEndpoint;
+import javax.websocket.server.ServerEndpointConfig;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+import org.apache.catalina.Context;
+import org.apache.catali
[Bug 55183] Missing WS Protocol Header in session negotiatedHeaders
https://issues.apache.org/bugzilla/show_bug.cgi?id=55183 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Mark Thomas --- Thanks for the report and the patch. I used a slightly different solution based on the fact that the client always stores headers with lower case names. -- 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: [taglibs] Site plans
On Mon, Jul 1, 2013 at 3:04 AM, Olivier Lamy wrote: > Apologize for delayed response. > > 2013/6/26 Jeremy Boynes : > > On Jun 25, 2013, at 7:54 AM, Henri Yandell wrote: > > > >> Help much appreciated - but do we want all the content of all the > modules > >> to be there? > >> > >> It feels to me that the website does not map directly to the codebase. > We > >> want an overall site, and subsites for Standard and for RDC. We don't > want > >> to have the 14 pom.xmls become a site structure, or the 4 pom.xmls > >> (tld-generator and extended). > > > > Three mini-sites sounds good: a top-level one holding things together > and then sub-sites for standard and RDC. Is there a way to associate the > top-level one with the parent POM and the others with the "root" poms in > standard and rdc? That would match with the things that are likely to be > released (being all "standard" packages together, or all "rdc" packages > together, but not both at the same time). Do we still need an aggregator > pom as well - how about setting up separate CI jobs for "standard" and > "rdc"? > > > > Coud be possible but do you want to deploy sites from tagged modules > versions ? (I presume yes). > In such case that will changed a bit as all modules will be in a > different svn path. > Apologies for no change on this - I've spent the week with flu. I wouldn't expect to deploy the site from tags - a site is a live/current thing. Hen
svn commit: r1499011 - /tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Author: markt
Date: Tue Jul 2 16:45:16 2013
New Revision: 1499011
URL: http://svn.apache.org/r1499011
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55184
Avoid NPE.
Patch provided by Niki Dokovski.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java?rev=1499011&r1=1499010&r2=1499011&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Tue Jul 2 16:45:16 2013
@@ -553,7 +553,7 @@ public class PojoMethodMapping {
m, session, config, null, params, indexInputStream,
true, indexSession, true, maxMessageSize);
results.add(mh);
-} else if (decoderMatch.hasMatches()) {
+} else if (decoderMatch != null && decoderMatch.hasMatches()) {
if (decoderMatch.getBinaryDecoders().size() > 0) {
MessageHandler mh = new PojoMessageHandlerWholeBinary(
pojo, m, session, config,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55184] NPE in PojoMethodMapping getMessageHandler
https://issues.apache.org/bugzilla/show_bug.cgi?id=55184 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Mark Thomas --- Thanks for the report and the patch. This has been fixed in trunk. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 46263] Tomcat reloading of context.xml does not update docBase
https://issues.apache.org/bugzilla/show_bug.cgi?id=46263 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #5 from Mark Thomas --- This feature request is covered by parallel deployment available in Tomcat 7 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: [VOTE] Release Apache Tomcat 7.0.42
2013/7/2 Mark Thomas wrote: > > The proposed Apache Tomcat 7.0.42 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.42/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-098/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_42/ > > The proposed 7.0.42 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 7.0.42 Stable Tested Tomcat in OSGi environment - successful Basic performance tests - successful Regards Violeta
svn commit: r1499058 - /tomcat/trunk/java/javax/el/BeanNameELResolver.java
Author: markt
Date: Tue Jul 2 18:52:15 2013
New Revision: 1499058
URL: http://svn.apache.org/r1499058
Log:
EL 3.0
New bean name resolver
Added:
tomcat/trunk/java/javax/el/BeanNameELResolver.java (with props)
Added: tomcat/trunk/java/javax/el/BeanNameELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanNameELResolver.java?rev=1499058&view=auto
==
--- tomcat/trunk/java/javax/el/BeanNameELResolver.java (added)
+++ tomcat/trunk/java/javax/el/BeanNameELResolver.java Tue Jul 2 18:52:15 2013
@@ -0,0 +1,128 @@
+/*
+ * 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 javax.el;
+
+import java.beans.FeatureDescriptor;
+import java.util.Iterator;
+
+public class BeanNameELResolver extends ELResolver {
+
+private final BeanNameResolver beanNameResolver;
+
+public BeanNameELResolver(BeanNameResolver beanNameResolver) {
+this.beanNameResolver = beanNameResolver;
+}
+
+@Override
+public Object getValue(ELContext context, Object base, Object property)
+throws NullPointerException, PropertyNotFoundException,
ELException {
+
+if (context == null) {
+throw new NullPointerException();
+}
+if (base != null || !(property instanceof String)) {
+return null;
+}
+
+String beanName = (String) property;
+
+if (beanNameResolver.isNameResolved(beanName)) {
+context.setPropertyResolved(true);
+return beanNameResolver.getBean((String) property);
+}
+
+return null;
+}
+
+@Override
+public void setValue(ELContext context, Object base, Object property,
+Object value) throws NullPointerException,
+PropertyNotFoundException, PropertyNotWritableException,
+ELException {
+
+if (context == null) {
+throw new NullPointerException();
+}
+if (base != null || !(property instanceof String)) {
+return;
+}
+
+String beanName = (String) property;
+
+if (beanNameResolver.isNameResolved(beanName) ||
+beanNameResolver.canCreateBean(beanName)) {
+context.setPropertyResolved(true);
+beanNameResolver.setBeanValue(beanName, value);
+}
+}
+
+@Override
+public Class getType(ELContext context, Object base, Object property)
+throws NullPointerException, PropertyNotFoundException,
ELException {
+
+if (context == null) {
+throw new NullPointerException();
+}
+if (base != null || !(property instanceof String)) {
+return null;
+}
+
+String beanName = (String) property;
+
+if (beanNameResolver.isNameResolved(beanName)) {
+context.setPropertyResolved(true);
+beanNameResolver.getBean(beanName).getClass();
+}
+
+return null;
+}
+
+@Override
+public boolean isReadOnly(ELContext context, Object base, Object property)
+throws NullPointerException, PropertyNotFoundException,
ELException {
+
+
+if (context == null) {
+throw new NullPointerException();
+}
+if (base != null || !(property instanceof String)) {
+// Return value undefined
+return false;
+}
+
+String beanName = (String) property;
+
+if (beanNameResolver.isNameResolved(beanName)) {
+context.setPropertyResolved(true);
+return beanNameResolver.isReadOnly(beanName);
+}
+
+// Return value undefined
+return false;
+}
+
+@Override
+public Iterator getFeatureDescriptors(ELContext context,
+Object base) {
+return null;
+}
+
+@Override
+public Class getCommonPropertyType(ELContext context, Object base) {
+return String.class;
+}
+}
Propchange: tomcat/trunk/java/javax/el/BeanNameELResolver.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-
svn commit: r1499062 - in /tomcat/trunk/java/javax/el: BeanNameELResolver.java BeanNameResolver.java
Author: markt
Date: Tue Jul 2 18:56:53 2013
New Revision: 1499062
URL: http://svn.apache.org/r1499062
Log:
@since markers for new EL classes
Modified:
tomcat/trunk/java/javax/el/BeanNameELResolver.java
tomcat/trunk/java/javax/el/BeanNameResolver.java
Modified: tomcat/trunk/java/javax/el/BeanNameELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanNameELResolver.java?rev=1499062&r1=1499061&r2=1499062&view=diff
==
--- tomcat/trunk/java/javax/el/BeanNameELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanNameELResolver.java Tue Jul 2 18:56:53 2013
@@ -19,6 +19,9 @@ package javax.el;
import java.beans.FeatureDescriptor;
import java.util.Iterator;
+/**
+ * @since EL 3.0
+ */
public class BeanNameELResolver extends ELResolver {
private final BeanNameResolver beanNameResolver;
Modified: tomcat/trunk/java/javax/el/BeanNameResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanNameResolver.java?rev=1499062&r1=1499061&r2=1499062&view=diff
==
--- tomcat/trunk/java/javax/el/BeanNameResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanNameResolver.java Tue Jul 2 18:56:53 2013
@@ -19,6 +19,8 @@ package javax.el;
/**
* Base implementation that provides a minimal default implementation that is
* intended to be extended by application developers.
+ *
+ * @since EL 3.0
*/
public abstract class BeanNameResolver {
-
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.42
On 02.07.2013 11:18, Mark Thomas wrote: > The proposed Apache Tomcat 7.0.42 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.42/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-098/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_42/ > > The proposed 7.0.42 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 7.0.42 Stable +1 to release. Details: - MD5 OK - signatures OK - key in KEYS file - gz and zip for src and bin consistent - src completely consistent with svn tag - builds fine - warning about unsafe or unchecked operations in: - javax/el/ResourceBundleELResolver.java:108 - org/apache/catalina/core/AsyncContextImpl.java:282 - org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (14 times) - org/apache/catalina/ha/context/ReplicatedContext.java:66 - org/apache/catalina/ha/session/BackupManager.java:175 - org/apache/catalina/filters/CsrfPreventionFilter.java:180 - org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java:119 - org/apache/coyote/http11/AbstractHttp11Processor.java:823 - org/apache/catalina/core/ApplicationContext.java:988+1130+1357 - org/apache/catalina/realm/JAASRealm.java:653 Same as for 7.0.41 plus ApplicationContext plus JAASRealm. - build result looks consistent with binaries - no checkstyle complaints - only one Javadoc warning - in jdbc-pool: DataSourceProxy.java:544: warning - Tag @link: can't find getParentLogger in javax.sql.DataSource - Unit tests no errors or failures - JMX MBean-Comparison OK (unchanged) Build and tests were done using Java 1.6.0_45. OS was Solaris 10 Sparc, tcnative was 1.1.27 based on APR 1.4.8 and OpenSSL 1.0.1e (plus a few patches). Unit test warnings (very similar to 7.0.35 and before, but two new ones, one NPE in access log, one testResources warning): - org.apache.catalina.deploy.TestWebXmlOrdering - BIO, NIO and APR: [main] org.apache.catalina.deploy.WebXml.orderWebFragments Used a wrong fragment name z at web.xml absolute-ordering tag! - org.apache.tomcat.util.net.TestCustomSsl - BIO twice "Exception getting SSL attributes" in org.apache.coyote.http11.Http11Processor actionInternal exception is: javax.net.ssl.SSLProtocolException: handshake alert: no_certificate - NIO twice "WARNING: Exception re-negotiating SSL connection" in org.apache.coyote.http11.Http11NioProcessor actionInternal - org.apache.catalina.core.TestStandardContextResources testResources - BIO, NIO and APR: testResources(): orderedLibs: [hamcrest-core-1.3.jar, resources.jar, resources2.jar] (new) - org.apache.catalina.connector.CoyoteAdapter log Exception while attempting to add an entry to the access log [junit] java.lang.NullPointerException [junit] at org.apache.catalina.connector.CoyoteAdapter.log(CoyoteAdapter.java:LINE) [junit] at org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:LINE) [junit] at ... (new) - tribes: several warnings (19), numbers slightly down (-7) from 7.0.41 but the same (+1) as 7.0.40. Same types of messages. Unit test SEVERE messages: 221 total (-4). Most of those are of type "Servlet.service() for servlet ... threw exception" (137 times, unchanged). Second biggest block: Countmessage 27 [junit] TIMESTAMP SEVERE [main] org.apache.tomcat.util.digester.Digester.startElement Begin event threw exception 3 [junit] TIMESTAMP SEVERE [main] org.apache.tomcat.util.digester.Digester.endElement End event threw exception Third biggest block is 19 (-8) messages from the mem leak detection during context unload. "Exception" in output of unit tests: 219 times (+5). Top exception counts (unchanged): 75 [junit] javax.servlet.ServletException: Opps. 9 [junit] java.io.IOException: Invalid CRLF, no CR character encountered. 9 [junit] java.lang.IllegalArgumentException: element is limited to 1 occurrence 9 [junit] java.lang.IllegalArgumentException: element is limited to 1 occurrence 9 [junit] java.lang.IllegalArgumentException: element is limited to 1 occurrence 6 [junit] org.apache.jasper.JasperException: /bug49nnn/bug49297DuplicateAttr.jsp (line: 21, column: 46) Attribute qualified names must be unique within an element I'm not claiming that any of the SEVERE or Exception messages are important. Total numbers of warnings, SEVERE and exceptions are about the same than for previous releases. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55180] connectionTimeout="-1" causes timeout can't be negative
https://issues.apache.org/bugzilla/show_bug.cgi?id=55180 --- Comment #3 from Roger Wang --- excuse me, I think the second problem is different from the bug 55160. because when connectionTimeout="0" disableUploadTimeout="true". it will always throw socketTimeoutException if read ==0 (socket.read(buf)). Thank you very much for your fixing. -- 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 55186] New: useIPVHosts=true , incorrect to get Request.localName
https://issues.apache.org/bugzilla/show_bug.cgi?id=55186
Bug ID: 55186
Summary: useIPVHosts=true , incorrect to get Request.localName
Product: Tomcat 7
Version: 7.0.30
Hardware: PC
OS: All
Status: NEW
Severity: normal
Priority: P2
Component: Connectors
Assignee: dev@tomcat.apache.org
Reporter: jmwmj...@163.com
I configured useIPVHosts=true.
&set up two hosts :
&my pc has two ip: 10.10.4.48 and 192.168.56.1
&HOSTS file is:
~~
127.0.0.1 localhost
192.168.56.1 www.jm.com
~~
& the Host localhost has a app named examples. the other Host www.jm.com has a
app named examples2.
start Tomcat,
visit http://www.jm.com:8080/examples2/test/ is ok. but i changed to visit
http://localhost:8080/examples/test without restart tc, it didn't work.
then i traced the codes,i found that :
~~~
if (connector.getUseIPVHosts()) {
serverName = req.localName(); //line 624
if (serverName.isNull()) {
// well, they did ask for it
res.action(ActionCode.REQ_LOCAL_NAME_ATTRIBUTE, null);
}
} else {
serverName = req.serverName();
}
~~~
at line 624 the value of serverName is still "www.jm.com" . it will still find
the Host www.jm.com to handle with the request.but this host doesn't have the
examples app, so it can't make it.
if i annotate the "if condition" , it works.
~
if (connector.getUseIPVHosts()) {
serverName = req.localName(); //line 624
//if (serverName.isNull()) {
//annotate if , execute action every time.
// well, they did ask for it
res.action(ActionCode.REQ_LOCAL_NAME_ATTRIBUTE, null);
//}
} else {
serverName = req.serverName();
}
--
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 55166] schemaLocation references between servlet and jsp XSDs are invalid
https://issues.apache.org/bugzilla/show_bug.cgi?id=55166
--- Comment #5 from Jeremy Boynes ---
Created attachment 30526
--> https://issues.apache.org/bugzilla/attachment.cgi?id=30526&action=edit
full output from test run
I was seeing the problem with xjc running against the resources directory. That
may not be a typical manifestation.
However, I put together this testcase for validation
@Test
public void testValidation() throws Exception {
System.out.println("ServletContext = " +
getClass().getResource("/javax/servlet/ServletContext.class"));
System.out.println("JspFactory = " +
getClass().getResource("/javax/servlet/jsp/JspFactory.class"));
SchemaFactory schemaFactory =
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
schemaFactory.setErrorHandler(new ErrorHandler() {
@Override
public void warning(SAXParseException exception) throws
SAXException {
exception.printStackTrace();
}
@Override
public void error(SAXParseException exception) throws SAXException
{
exception.printStackTrace();
}
@Override
public void fatalError(SAXParseException exception) throws
SAXException {
exception.printStackTrace();
}
});
URL url =
ServletContext.class.getResource("/javax/servlet/resources/web-app_3_0.xsd");
System.out.println("url = " + url);
Schema schema = schemaFactory.newSchema(url);
}
which fails with
org.xml.sax.SAXParseException; systemId:
jar:file:/Users/jeremy/apache/apache-tomcat-7.0.41/lib/servlet-api.jar!/javax/servlet/resources/web-common_3_0.xsd;
lineNumber: 119; columnNumber: 46; schema_reference.4: Failed to read schema
document 'jsp_2_2.xsd', because 1) could not find the document; 2) the document
could not be read; 3) the root element of the document is not .
Caused by: java.io.FileNotFoundException: JAR entry
javax/servlet/resources/jsp_2_2.xsd not found in
/Users/jeremy/apache/apache-tomcat-7.0.41/lib/servlet-api.jar
The full output is attached. As you can see, it is looking for jsp_2_2.xsd in
same location as the web-common_3_0.xsd resource that is including it. I ran
against the lib directory from a download of 7.0.41.
I don't know how the TCK is validating. It may have a custom resolver for its
own copies of the XSDs.
--
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 55166] schemaLocation references between servlet and jsp XSDs are invalid
https://issues.apache.org/bugzilla/show_bug.cgi?id=55166 Jeremy Boynes changed: What|Removed |Added Attachment #30508|0 |1 is obsolete|| --- Comment #6 from Jeremy Boynes --- Created attachment 30527 --> https://issues.apache.org/bugzilla/attachment.cgi?id=30527&action=edit Patch to add testcase to trunk Patch to add the prior testcase to trunk. It passes if I svn copy the jsp xsds to javax/servlet/resources but I didn't do that in the patch in order to keep file history. It fails to validate on test/webapp/WEB-INF/web.xml so I also includes changes to make that file conform to the XSD (basically reordering a couple of elements). -- 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: [taglibs] Site plans
On Jul 2, 2013, at 9:41 AM, Henri Yandell wrote: > > I wouldn't expect to deploy the site from tags - a site is a live/current > thing. The core site is a live/current thing, but there is also the documentation/reports etc. that would be associated with a specific tag. IOW, the site could contain the JavaDoc for 1.1.2, 1.2.0, and 1.2.1 etc. That would suggest 1+N parts as Olivier suggests, one for the live site and one generated from each tag. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55166] schemaLocation references between servlet and jsp XSDs are invalid
https://issues.apache.org/bugzilla/show_bug.cgi?id=55166 Jeremy Boynes changed: What|Removed |Added Attachment #30527|0 |1 is obsolete|| --- Comment #7 from Jeremy Boynes --- Created attachment 30528 --> https://issues.apache.org/bugzilla/attachment.cgi?id=30528&action=edit Same as 30527 but with ASF header and link to this 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
[Bug 55180] connectionTimeout="-1" causes timeout can't be negative
https://issues.apache.org/bugzilla/show_bug.cgi?id=55180 --- Comment #4 from Violeta Georgieva --- (In reply to Roger Wang from comment #3) > excuse me, I think the second problem is different from the bug 55160. > because when connectionTimeout="0" disableUploadTimeout="true". > it will always throw socketTimeoutException if read ==0 (socket.read(buf)). > Thank you very much for your fixing. Please open a new bug for this particular problem. Thanks Violeta -- 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
