svn commit: r1740465 - in /tomcat/trunk/test/org/apache/catalina: mapper/TestMapperListener.java mapper/TestMapperWebapps.java startup/TestTomcat.java
Author: remm
Date: Fri Apr 22 08:38:17 2016
New Revision: 1740465
URL: http://svn.apache.org/viewvc?rev=1740465&view=rev
Log:
59365: Avoid basing the test on the only portion of the output that is
internationalized. (part 2)
Modified:
tomcat/trunk/test/org/apache/catalina/mapper/TestMapperListener.java
tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Modified: tomcat/trunk/test/org/apache/catalina/mapper/TestMapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mapper/TestMapperListener.java?rev=1740465&r1=1740464&r2=1740465&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/mapper/TestMapperListener.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mapper/TestMapperListener.java Fri
Apr 22 08:38:17 2016
@@ -59,7 +59,7 @@ public class TestMapperListener extends
res = getUrl("http://localhost:"; + getPort()
+ "/examples/servlets/servlet/HelloWorldExample");
text = res.toString();
-Assert.assertTrue(text, text.contains("Hello World!"));
+Assert.assertTrue(text, text.contains(""));
List listenersFirst = new ArrayList<>();
populateListenersInfo(listenersFirst, tomcat.getEngine());
@@ -70,7 +70,7 @@ public class TestMapperListener extends
res = getUrl("http://localhost:"; + getPort()
+ "/examples/servlets/servlet/HelloWorldExample");
text = res.toString();
-Assert.assertTrue(text, text.contains("Hello World!"));
+Assert.assertTrue(text, text.contains(""));
List listenersSecond = new ArrayList<>();
populateListenersInfo(listenersSecond, tomcat.getEngine());
Modified: tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java?rev=1740465&r1=1740464&r2=1740465&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java Fri Apr
22 08:38:17 2016
@@ -107,7 +107,7 @@ public class TestMapperWebapps extends T
res = getUrl("http://localhost:"; + getPort()
+ "/examples/servlets/servlet/HelloWorldExample");
text = res.toString();
-Assert.assertTrue(text, text.contains("Hello World!"));
+Assert.assertTrue(text, text.contains(""));
res = getUrl("http://localhost:"; + getPort()
+ "/examples/jsp/jsp2/el/basic-arithmetic.jsp");
@@ -141,7 +141,7 @@ public class TestMapperWebapps extends T
res = getUrl("http://localhost:"; + getPort()
+ "/examples/servlets/servlet/HelloWorldExample");
text = res.toString();
-Assert.assertTrue(text, text.contains("Hello World!"));
+Assert.assertTrue(text, text.contains(""));
res = getUrl("http://localhost:"; + getPort()
+ "/examples/jsp/jsp2/el/basic-arithmetic.jsp");
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1740465&r1=1740464&r2=1740465&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Fri Apr 22
08:38:17 2016
@@ -212,7 +212,7 @@ public class TestTomcat extends TomcatBa
ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/examples/servlets/servlet/HelloWorldExample");
String text = res.toString();
-assertTrue(text, text.indexOf("Hello World!") > 0);
+assertTrue(text, text.indexOf("") > 0);
}
@Test
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1740468 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/catalina/mapper/TestMapperListener.java test/org/apache/catalina/mapper/TestMapperWebapps.java test/org/apache/catalina/startup/Test
Author: remm
Date: Fri Apr 22 09:00:51 2016
New Revision: 1740468
URL: http://svn.apache.org/viewvc?rev=1740468&view=rev
Log:
59365: Avoid basing the test on the only portion of the output that is
internationalized. (part 2)
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperListener.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 22 09:00:51 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperListener.java?rev=1740468&r1=1740467&r2=1740468&view=diff
==
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperListener.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperListener.java
Fri Apr 22 09:00:51 2016
@@ -59,7 +59,7 @@ public class TestMapperListener extends
res = getUrl("http://localhost:"; + getPort()
+ "/examples/servlets/servlet/HelloWorldExample");
text = res.toString();
-Assert.assertTrue(text, text.contains("Hello World!"));
+Assert.assertTrue(text, text.contains(""));
List listenersFirst = new ArrayList<>();
populateListenersInfo(listenersFirst, tomcat.getEngine());
@@ -70,7 +70,7 @@ public class TestMapperListener extends
res = getUrl("http://localhost:"; + getPort()
+ "/examples/servlets/servlet/HelloWorldExample");
text = res.toString();
-Assert.assertTrue(text, text.contains("Hello World!"));
+Assert.assertTrue(text, text.contains(""));
List listenersSecond = new ArrayList<>();
populateListenersInfo(listenersSecond, tomcat.getEngine());
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java?rev=1740468&r1=1740467&r2=1740468&view=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java
Fri Apr 22 09:00:51 2016
@@ -107,7 +107,7 @@ public class TestMapperWebapps extends T
res = getUrl("http://localhost:"; + getPort()
+ "/examples/servlets/servlet/HelloWorldExample");
text = res.toString();
-Assert.assertTrue(text, text.contains("Hello World!"));
+Assert.assertTrue(text, text.contains(""));
res = getUrl("http://localhost:"; + getPort()
+ "/examples/jsp/jsp2/el/basic-arithmetic.jsp");
@@ -141,7 +141,7 @@ public class TestMapperWebapps extends T
res = getUrl("http://localhost:"; + getPort()
+ "/examples/servlets/servlet/HelloWorldExample");
text = res.toString();
-Assert.assertTrue(text, text.contains("Hello World!"));
+Assert.assertTrue(text, text.contains(""));
res = getUrl("http://localhost:"; + getPort()
+ "/examples/jsp/jsp2/e
svn commit: r1740469 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/mapper/TestMapperListener.java test/org/apache/catalina/mapper/TestMapperWebapps.java test/org/apache/catalina/startup/Test
Author: remm Date: Fri Apr 22 09:01:28 2016 New Revision: 1740469 URL: http://svn.apache.org/viewvc?rev=1740469&view=rev Log: 59365: Avoid basing the test on the only portion of the output that is internationalized. (part 2) Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/test/org/apache/catalina/mapper/TestMapperListener.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 22 09:01:28 2016 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452 7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,168968
svn commit: r1740470 - in /tomcat/tc7.0.x/trunk/test/org/apache: catalina/connector/TestMapperListener.java catalina/startup/TestTomcat.java tomcat/util/http/mapper/TestMapperWebapps.java
Author: remm
Date: Fri Apr 22 09:06:20 2016
New Revision: 1740470
URL: http://svn.apache.org/viewvc?rev=1740470&view=rev
Log:
59365: Avoid basing the test on the only portion of the output that is
internationalized. (part 2)
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMapperListener.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMapperListener.java?rev=1740470&r1=1740469&r2=1740470&view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMapperListener.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMapperListener.java
Fri Apr 22 09:06:20 2016
@@ -55,7 +55,7 @@ public class TestMapperListener extends
res = getUrl("http://localhost:"; + getPort()
+ "/examples/servlets/servlet/HelloWorldExample");
text = res.toString();
-Assert.assertTrue(text, text.contains("Hello World!"));
+Assert.assertTrue(text, text.contains(""));
List listenersFirst = new ArrayList();
populateListenersInfo(listenersFirst, tomcat.getEngine());
@@ -66,7 +66,7 @@ public class TestMapperListener extends
res = getUrl("http://localhost:"; + getPort()
+ "/examples/servlets/servlet/HelloWorldExample");
text = res.toString();
-Assert.assertTrue(text, text.contains("Hello World!"));
+Assert.assertTrue(text, text.contains(""));
List listenersSecond = new ArrayList();
populateListenersInfo(listenersSecond, tomcat.getEngine());
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1740470&r1=1740469&r2=1740470&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java Fri
Apr 22 09:06:20 2016
@@ -273,7 +273,7 @@ public class TestTomcat extends TomcatBa
ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/examples/servlets/servlet/HelloWorldExample");
String text = res.toString();
-assertTrue(text, text.indexOf("Hello World!") > 0);
+assertTrue(text, text.indexOf("") > 0);
}
@Test
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java?rev=1740470&r1=1740469&r2=1740470&view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java
Fri Apr 22 09:06:20 2016
@@ -105,7 +105,7 @@ public class TestMapperWebapps extends T
res = getUrl("http://localhost:"; + getPort()
+ "/examples/servlets/servlet/HelloWorldExample");
text = res.toString();
-Assert.assertTrue(text, text.contains("Hello World!"));
+Assert.assertTrue(text, text.contains(""));
res = getUrl("http://localhost:"; + getPort()
+ "/examples/jsp/jsp2/el/basic-arithmetic.jsp");
@@ -139,7 +139,7 @@ public class TestMapperWebapps extends T
res = getUrl("http://localhost:"; + getPort()
+ "/examples/servlets/servlet/HelloWorldExample");
text = res.toString();
-Assert.assertTrue(text, text.contains("Hello World!"));
+Assert.assertTrue(text, text.contains(""));
res = getUrl("http://localhost:"; + getPort()
+ "/examples/jsp/jsp2/el/basic-arithmetic.jsp");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1740472 - /tomcat/tc6.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
Author: remm
Date: Fri Apr 22 09:07:57 2016
New Revision: 1740472
URL: http://svn.apache.org/viewvc?rev=1740472&view=rev
Log:
59365: Avoid basing the test on the only portion of the output that is
internationalized. (part 2)
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
Modified: tomcat/tc6.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1740472&r1=1740471&r2=1740472&view=diff
==
--- tomcat/tc6.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
(original)
+++ tomcat/tc6.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java Fri
Apr 22 09:07:57 2016
@@ -269,7 +269,7 @@ public class TestTomcat extends TomcatBa
ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/examples/servlets/servlet/HelloWorldExample");
String text = res.toString();
-assertTrue(text, text.indexOf("Hello World!") > 0);
+assertTrue(text, text.indexOf("") > 0);
}
@Test
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59365] Locale sensitive assertions in TestSsl and TestCustomSsl
https://bz.apache.org/bugzilla/show_bug.cgi?id=59365 Remy Maucherat changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #4 from Remy Maucherat --- Ok, there were some remaining items. -- 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
Memory leak progress report
Hi, As I mentioned previously, I am working through the memory leak detection and prevention code looking to see how it interacts with Java 9, particularly the restrictions placed on reflection. I started with the RMI leak protection in WebappClassLoaderBase. I have discovered from the OpenJDK devs[1] that there is a way that applications can clean up after themselves which moves this leak to the category of application error that should get a nice loud error message. The problem is that there isn't a public API to identify what the leaks are so generating those error messages - particularly in Java 9 - is going to be tricky. I have set up a GitHub repo [2] where I am creating sample apps to use to explore the leaks that you might interesting. Mark [1] http://mail.openjdk.java.net/pipermail/core-libs-dev/2016-April/040449.html [2] https://github.com/markt-asf/memory-leaks - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59365] Locale sensitive assertions in TestSsl and TestCustomSsl
https://bz.apache.org/bugzilla/show_bug.cgi?id=59365 Konstantin Kolinko changed: What|Removed |Added Status|RESOLVED|CLOSED --- Comment #5 from Konstantin Kolinko --- OK. It is good now. Thank you. -- 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: r1740482 - in /tomcat/site/trunk: docs/ci.html xdocs/ci.xml
Author: kkolinko Date: Fri Apr 22 11:18:23 2016 New Revision: 1740482 URL: http://svn.apache.org/viewvc?rev=1740482&view=rev Log: Organize links to projects built at Gump. Add Native 1.2 builds (a) OpenSSL 1.0.2, b) OpemSSL 1.1.0). Modified: tomcat/site/trunk/docs/ci.html tomcat/site/trunk/xdocs/ci.xml Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1740482&r1=1740481&r2=1740482&view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Fri Apr 22 11:18:23 2016 @@ -505,7 +505,8 @@ prepared and published by ASF Buildbot, -http://vmgump.apache.org/gump/public/tomcat-trunk/";>tomcat-trunk +http://vmgump.apache.org/gump/public/tomcat-trunk/";>tomcat-trunk +Tomcat 9.0.x @@ -557,7 +558,8 @@ prepared and published by ASF Buildbot, -http://vmgump.apache.org/gump/public/tomcat-8.0.x/";>tomcat-8.0.x +http://vmgump.apache.org/gump/public/tomcat-8.0.x/";>tomcat-8.0.x +Tomcat 8.0.x @@ -613,7 +615,8 @@ prepared and published by ASF Buildbot, -http://vmgump.apache.org/gump/public/tomcat-7.0.x/";>tomcat-7.0.x +http://vmgump.apache.org/gump/public/tomcat-7.0.x/";>tomcat-7.0.x +Tomcat 7.0.x @@ -669,7 +672,8 @@ prepared and published by ASF Buildbot, -http://vmgump.apache.org/gump/public/tomcat-tc6/";>tomcat-tc6 +http://vmgump.apache.org/gump/public/tomcat-tc6/";>tomcat-tc6 +Tomcat 6.0.x @@ -698,7 +702,8 @@ prepared and published by ASF Buildbot, -http://vmgump.apache.org/gump/public/tomcat-native/";>tomcat-native +http://vmgump.apache.org/gump/public/tomcat-native/";>tomcat-native +Tomcat Native 1.1.xuses:OpenSSL 1.0.2[x]APR 1.6.x @@ -738,7 +743,90 @@ prepared and published by ASF Buildbot, -http://vmgump.apache.org/gump/public/tomcat-taglibs/";>tomcat-taglibs +http://vmgump.apache.org/gump/public/tomcat-native-12/";>tomcat-native-12 +Tomcat Native 1.2.xuses:OpenSSL 1.0.2[x]APR 1.6.x + + + + +Source path: /tomcat/native/trunk + + + +Projects: + + + + +http://vmgump.apache.org/gump/public/tomcat-native-12/tomcat-native-12-buildconf/";>tomcat-native-12-buildconf + + + +http://vmgump.apache.org/gump/public/tomcat-native-12/tomcat-native-12-configure/";>tomcat-native-12-configure + + + +http://vmgump.apache.org/gump/public/tomcat-native-12/tomcat-native-12-make/";>tomcat-native-12-make - performs the actual build + + +http://vmgump.apache.org/gump/public/tomcat-native-12/tomcat-native-12-make-install/";>tomcat-native-12-make-install + + + + + + + + + + + + + + +http://vmgump.apache.org/gump/public/tomcat-native-trunk/";>tomcat-native-trunk +Tomcat Native 1.2.xuses:OpenSSL master (1.1.0)APR 1.6.x + + + + +Source path: /tomcat/native/trunk + + + +Projects: + + + + +http://vmgump.apache.org/gump/public/tomcat-native-trunk/tomcat-native-trunk-buildconf/";>tomcat-native-trunk-buildconf + + + +http://vmgump.apache.org/gump/public/tomcat-native-trunk/tomcat-native-trunk-configure/";>tomcat-native-trunk-configure + + + +http://vmgump.apache.org/gump/public/tomcat-native-trunk/tomcat-native-trunk-make/";>tomcat-native-trunk-make - performs the actual build + + +http://vmgump.apache.org/gump/public/tomcat-native-trunk/tomcat-native-trunk-make-install/";>tomcat-native-trunk-make-install + + + + + + + + + + + + + + +http://vmgump.apache.org/gump/public/tomcat-taglibs/";>tomcat-taglibs +Standard Taglib (JSTL 1.2) Modified: tomcat/site/trunk/xdocs/ci.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1740482&r1=1740481&r2=1740482&view=diff == --- tomcat/site/trunk/xdocs/ci.xml (original) +++ tomcat/site/trunk/xdocs/ci.xml Fri Apr 22 11:18:23 2016 @@ -132,7 +132,7 @@ prepared and published by ASF Buildbot, - http://vmgump.apache.org/gump/public/tomcat-trunk/";>tomcat-trunk + http://vmgump.apache.org/gump/public/tomcat-trunk/";>tomcat-trunkTomcat 9.0.x Source path: /tomcat/trunk @@ -151,7 +151,7 @@ prepared and published by ASF Buildbot, - http://vmgump.apache.org/gump/public/tomcat-8.0.x/";>tomcat-8.0.x + http://vmgump.apache.org/gump/public/tomcat-8.0.x/";>tomcat-8.0.xTomcat 8.0.x Source path: /tomcat/tc8.0.x/trunk @@ -171,7 +171,7 @@ prepared and published by ASF Buildbot, - http://vmgump.apache.org/gump/public/tomcat-7.0.x/";>tomcat-7.0.x + http://vmgump.apache.org/gump/public/tomcat-7.0.x/";>tomcat-7.0.xTomcat 7.0.x Source path: /tomcat/tc7.0.x/trunk @@ -191,7 +191,7 @@ prepared and published by ASF Buildbot, - http://vmgump.apache.org/gump/public/tomcat-tc6/";>tomcat-tc6 +
svn commit: r1740484 - in /tomcat/site/trunk: docs/ci.html xdocs/ci.xml
Author: kkolinko Date: Fri Apr 22 11:26:26 2016 New Revision: 1740484 URL: http://svn.apache.org/viewvc?rev=1740484&view=rev Log: Add link to mod_jk built by Gump. Modified: tomcat/site/trunk/docs/ci.html tomcat/site/trunk/xdocs/ci.xml Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1740484&r1=1740483&r2=1740484&view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Fri Apr 22 11:26:26 2016 @@ -825,6 +825,47 @@ prepared and published by ASF Buildbot, +http://vmgump.apache.org/gump/public/tomcat-connectors-native/";>tomcat-connectors-native +Tomcat Connectors (mod_jk)uses:Apache HTTP Server trunk + + + + +Source path: /tomcat/jk/trunk + + + +Projects: + + + + +http://vmgump.apache.org/gump/public/tomcat-connectors-native/tomcat-connectors-native/";>tomcat-connectors-native + + + +http://vmgump.apache.org/gump/public/tomcat-connectors-native/tomcat-jk-native-buildconf/";>tomcat-jk-native-buildconf + + + +http://vmgump.apache.org/gump/public/tomcat-connectors-native/tomcat-jk-native-configure/";>tomcat-jk-native-configure + + + +http://vmgump.apache.org/gump/public/tomcat-connectors-native/tomcat-jk-native/";>tomcat-jk-native - performs the actual build + + + + + + + + + + + + + http://vmgump.apache.org/gump/public/tomcat-taglibs/";>tomcat-taglibs Standard Taglib (JSTL 1.2) Modified: tomcat/site/trunk/xdocs/ci.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1740484&r1=1740483&r2=1740484&view=diff == --- tomcat/site/trunk/xdocs/ci.xml (original) +++ tomcat/site/trunk/xdocs/ci.xml Fri Apr 22 11:26:26 2016 @@ -252,6 +252,22 @@ prepared and published by ASF Buildbot, + http://vmgump.apache.org/gump/public/tomcat-connectors-native/";>tomcat-connectors-nativeTomcat Connectors (mod_jk)uses:Apache HTTP Server trunk + + + Source path: /tomcat/jk/trunk + Projects: + + http://vmgump.apache.org/gump/public/tomcat-connectors-native/tomcat-connectors-native/";>tomcat-connectors-native + http://vmgump.apache.org/gump/public/tomcat-connectors-native/tomcat-jk-native-buildconf/";>tomcat-jk-native-buildconf + http://vmgump.apache.org/gump/public/tomcat-connectors-native/tomcat-jk-native-configure/";>tomcat-jk-native-configure + http://vmgump.apache.org/gump/public/tomcat-connectors-native/tomcat-jk-native/";>tomcat-jk-native - performs the actual build + + + + + + http://vmgump.apache.org/gump/public/tomcat-taglibs/";>tomcat-taglibsStandard Taglib (JSTL 1.2) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1740487 - in /tomcat/site/trunk: docs/ci.html xdocs/ci.xml
Author: kkolinko Date: Fri Apr 22 11:51:21 2016 New Revision: 1740487 URL: http://svn.apache.org/viewvc?rev=1740487&view=rev Log: Add links to Tomcat 8.5 builds results at Buildbot. Add links to "periodic" builders for Tomcat 9, 8.0. Modified: tomcat/site/trunk/docs/ci.html tomcat/site/trunk/xdocs/ci.xml Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1740487&r1=1740486&r2=1740487&view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Fri Apr 22 11:51:21 2016 @@ -282,7 +282,11 @@ prepared and published by ASF Buildbot, -http://ci.apache.org/projects/tomcat/tomcat9/docs/index.html"; rel="nofollow">Tomcat trunk (9.0.x) +http://ci.apache.org/projects/tomcat/tomcat9/docs/index.html"; rel="nofollow">Tomcat 9.0.x (trunk) + + +http://ci.apache.org/projects/tomcat/tomcat85/docs/index.html"; rel="nofollow">Tomcat 8.5.x + http://ci.apache.org/projects/tomcat/tomcat8/docs/index.html"; rel="nofollow">Tomcat 8.0.x @@ -327,8 +331,12 @@ prepared and published by ASF Buildbot, -http://ci.apache.org/builders/tomcat-trunk";>Build status page - +http://ci.apache.org/builders/tomcat-trunk";>Build status page for tomcat-trunk +This builder is triggered after each commit. It does a release build and runs tests (using multiple parallel threads). + + +https://ci.apache.org/builders/tomcat-trunk-periodic";>Build status page for tomcat-trunk-periodic +This builder is triggered once a day. It runs tests serially and generates a coverage report. http://ci.apache.org/projects/tomcat/tomcat9/"; rel="nofollow">Published files: @@ -362,6 +370,47 @@ prepared and published by ASF Buildbot, +tomcat-85-trunk + + + + +Source path: /tomcat/tc8.5.x/trunk + + + +http://ci.apache.org/builders/tomcat-85-trunk";>Build status page for tomcat-85-trunk +This builder is triggered after each commit. It does a release build and runs tests (using multiple parallel threads). + + +http://ci.apache.org/projects/tomcat/tomcat85/"; rel="nofollow">Published files: + + + +http://ci.apache.org/projects/tomcat/tomcat85/docs/index.html"; rel="nofollow">Documentation + + + +http://ci.apache.org/projects/tomcat/tomcat85/logs/"; rel="nofollow">JUnit logs + by revision number. The recent ones are at the bottom. + + + +http://ci.apache.org/projects/tomcat/tomcat85/rat-output.html"; rel="nofollow">RAT report + + + + + + + + + + + + + + tomcat-8-trunk @@ -371,8 +420,12 @@ prepared and published by ASF Buildbot, -http://ci.apache.org/builders/tomcat-8-trunk";>Build status page - +http://ci.apache.org/builders/tomcat-8-trunk";>Build status page for tomcat-8-trunk +This builder is triggered after each commit. It does a release build and runs tests (using multiple parallel threads). + + +https://ci.apache.org/builders/tomcat-8-trunk-periodic";>Build status page for tomcat-8-trunk-periodic +This builder is triggered once a day. It runs tests serially and generates a coverage report. http://ci.apache.org/projects/tomcat/tomcat8/"; rel="nofollow">Published files: Modified: tomcat/site/trunk/xdocs/ci.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1740487&r1=1740486&r2=1740487&view=diff == --- tomcat/site/trunk/xdocs/ci.xml (original) +++ tomcat/site/trunk/xdocs/ci.xml Fri Apr 22 11:51:21 2016 @@ -36,7 +36,8 @@ currently developed not yet released ver prepared and published by ASF Buildbot, using the latest source code. - http://ci.apache.org/projects/tomcat/tomcat9/docs/index.html"; rel="nofollow">Tomcat trunk (9.0.x) + http://ci.apache.org/projects/tomcat/tomcat9/docs/index.html"; rel="nofollow">Tomcat 9.0.x (trunk) + http://ci.apache.org/projects/tomcat/tomcat85/docs/index.html"; rel="nofollow">Tomcat 8.5.x http://ci.apache.org/projects/tomcat/tomcat8/docs/index.html"; rel="nofollow">Tomcat 8.0.x http://ci.apache.org/projects/tomcat/tomcat7/docs/index.html"; rel="nofollow">Tomcat 7.0.x http://ci.apache.org/projects/tomcat/tomcat6/docs/index.html"; rel="nofollow">Tomcat 6.0.x @@ -57,7 +58,8 @@ prepared and published by ASF Buildbot, Source path: /tomcat/trunk - http://ci.apache.org/builders/tomcat-trunk";>Build status page + http://ci.apache.org/builders/tomcat-trunk";>Build status page for tomcat-trunkThis builder is triggered after each commit. It does a release build and runs tests (using multiple parallel threads). + https://ci.apache.org/builders/tomcat-trunk-periodic";>Build status page for tomcat-trunk-periodicThis builder is triggered once a day. It runs tests serially and generates a coverage report. http://ci
svn commit: r1740495 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
Author: remm
Date: Fri Apr 22 12:25:56 2016
New Revision: 1740495
URL: http://svn.apache.org/viewvc?rev=1740495&view=rev
Log:
Trivial cleanups.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1740495&r1=1740494&r2=1740495&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java Fri
Apr 22 12:25:56 2016
@@ -217,7 +217,7 @@ public final class OpenSSLEngine extends
}
/**
- * Write plaintext data to the OpenSSL internal BIO
+ * Write plain text data to the OpenSSL internal BIO
*
* Calling this function with src.remaining == 0 is undefined.
*/
@@ -298,7 +298,7 @@ public final class OpenSSLEngine extends
}
/**
- * Read plaintext data from the OpenSSL internal BIO
+ * Read plain text data from the OpenSSL internal BIO
*/
private int readPlaintextData(final ByteBuffer dst) {
if (dst.isDirect()) {
@@ -379,19 +379,14 @@ public final class OpenSSLEngine extends
}
// Throw required runtime exceptions
-if (srcs == null) {
+if (srcs == null || dst == null) {
throw new
IllegalArgumentException(sm.getString("engine.nullBuffer"));
}
-if (dst == null) {
-throw new
IllegalArgumentException(sm.getString("engine.nullBuffer"));
-}
-
if (offset >= srcs.length || offset + length > srcs.length) {
throw new
IndexOutOfBoundsException(sm.getString("engine.invalidBufferArray",
Integer.toString(offset), Integer.toString(length),
Integer.toString(srcs.length)));
}
-
if (dst.isReadOnly()) {
throw new ReadOnlyBufferException();
}
@@ -415,7 +410,7 @@ public final class OpenSSLEngine extends
// Check for pending data in the network BIO
pendingNet = SSL.pendingWrittenBytesInBIO(networkBIO);
if (pendingNet > 0) {
-// Do we have enough room in dst to write encrypted data?
+// Do we have enough room in destination to write encrypted data?
int capacity = dst.remaining();
if (capacity < pendingNet) {
return new
SSLEngineResult(SSLEngineResult.Status.BUFFER_OVERFLOW, handshakeStatus, 0, 0);
@@ -448,7 +443,7 @@ public final class OpenSSLEngine extends
}
while (src.hasRemaining()) {
-// Write plaintext application data to the SSL engine
+// Write plain text application data to the SSL engine
try {
bytesConsumed += writePlaintextData(src);
} catch (Exception e) {
@@ -486,11 +481,8 @@ public final class OpenSSLEngine extends
return new SSLEngineResult(SSLEngineResult.Status.CLOSED,
SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING, 0, 0);
}
-// Throw requried runtime exceptions
-if (src == null) {
-throw new
IllegalArgumentException(sm.getString("engine.nullBuffer"));
-}
-if (dsts == null) {
+// Throw required runtime exceptions
+if (src == null || dsts == null) {
throw new
IllegalArgumentException(sm.getString("engine.nullBuffer"));
}
if (offset >= dsts.length || offset + length > dsts.length) {
@@ -498,7 +490,6 @@ public final class OpenSSLEngine extends
Integer.toString(offset), Integer.toString(length),
Integer.toString(dsts.length)));
}
-
int capacity = 0;
final int endOffset = offset + length;
for (int i = offset; i < endOffset; i++) {
@@ -744,7 +735,7 @@ public final class OpenSSLEngine extends
@Override
public String[] getEnabledProtocols() {
List enabled = new ArrayList<>();
-// Seems like there is no way to explict disable SSLv2Hello in openssl
so it is always enabled
+// Seems like there is no way to explicitly disable SSLv2Hello in
OpenSSL so it is always enabled
enabled.add(Constants.SSL_PROTO_SSLv2Hello);
int opts = SSL.getOptions(ssl);
if ((opts & SSL.SSL_OP_NO_TLSv1) == 0) {
@@ -1066,7 +1057,7 @@ public final class OpenSSLEngine extends
@Override
public long getCreationTime() {
-// We need ot multiple by 1000 as openssl uses seconds and we need
milli-seconds.
+// We need to multiply by 1000 as OpenSSL uses seconds and we need
milliseconds.
return SSL.getTime(ssl) * 1000L;
}
--
svn commit: r1740496 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
Author: remm
Date: Fri Apr 22 12:27:02 2016
New Revision: 1740496
URL: http://svn.apache.org/viewvc?rev=1740496&view=rev
Log:
Trivial cleanup
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 22 12:27:02 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1740496&r1=1740495&r2=1740496&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
Fri Apr 22 12:27:02 2016
@@ -217,7 +217,7 @@ public final class OpenSSLEngine extends
}
/**
- * Write plaintext data to the OpenSSL internal BIO
+ * Write plain text data to the OpenSSL internal BIO
*
* Calling this function with src.remaining == 0 is undefined.
*/
@@ -298,7 +298,7 @@ public final class OpenSSLEngine extends
}
/**
- * Read plaintext data from the OpenSSL internal BIO
+ * Read plain text data from the OpenSSL internal BIO
*/
private int readPlaintextData(final ByteBuffer dst) {
if (dst.isDirect()) {
@@ -379,19 +379,14 @@ public final class OpenSSLEngine extends
}
// Throw required runtime exceptions
-if (srcs == null) {
+if (srcs == null || dst == null) {
throw new
IllegalArgumentException(sm.getString("engine.nullBuffer"));
}
-if (dst == null) {
-throw new
IllegalArgumentException(sm.getString("engine.nullBuffer"));
-}
-
if (offset >= srcs.length || offset + length > srcs.length) {
throw new
IndexOutOfBoundsException(sm.getString("engine.invalidBufferArray",
Integer.toString(offset), Integer.toString(length),
Integer.toString(srcs.length)));
}
-
if (dst.isReadOnly()) {
throw new ReadOnlyBufferException();
}
@@ -415,7 +410,7 @@ public final class OpenSSLEngine extends
// Check for pending data in the network BIO
pendingNet = SSL.pendingWrittenBytesInBIO(networkBIO);
if (pendingNet > 0) {
-// Do we have enough room in dst to write encrypted data?
+// Do we have enough room in destination to write encrypted data?
int capacity = dst.remaining();
if (capacity < pendingNet) {
return new
SSLEngineResult(SSLEngineResult.Status.BUFFER_OVERFLOW, handshakeStatus, 0, 0);
@@ -448,7 +443,7 @@ public final class OpenSSLEngine extends
}
while (src.hasRemaining()) {
-// Write plaintext application data to the SSL engine
+// Write plain text application data to the SSL engine
try {
bytesConsumed += writePlaintextData(src);
} catch (Exception e) {
@@ -486,11 +481,8 @@ public final class OpenSSLEngine extends
return new SSLEngineResult(SSLEngineResult.Status.CLOSED,
SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING, 0
svn commit: r1740508 - /tomcat/trunk/java/org/apache/catalina/tribes/Channel.java
Author: markt
Date: Fri Apr 22 12:56:44 2016
New Revision: 1740508
URL: http://svn.apache.org/viewvc?rev=1740508&view=rev
Log:
Fix Javadoc nag
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/Channel.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/Channel.java?rev=1740508&r1=1740507&r2=1740508&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/Channel.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/Channel.java Fri Apr 22
12:56:44 2016
@@ -365,7 +365,7 @@ public interface Channel {
/**
* Set the name of this channel
- * @param name
+ * @param name The new channel name
*/
public void setName(String name);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1740509 - in /tomcat/trunk/java/org/apache: catalina/connector/ catalina/valves/ coyote/ coyote/ajp/ coyote/http11/ coyote/http2/
Author: markt
Date: Fri Apr 22 12:57:50 2016
New Revision: 1740509
URL: http://svn.apache.org/viewvc?rev=1740509&view=rev
Log:
Fix regression between first and second parts of fix for BZ 59219
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/trunk/java/org/apache/coyote/ActionCode.java
tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1740509&r1=1740508&r2=1740509&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Fri Apr 22
12:57:50 2016
@@ -1645,6 +1645,16 @@ public class Request implements HttpServ
return asyncContext;
}
+public boolean isAsyncStarting() {
+if (asyncContext == null) {
+return false;
+}
+
+AtomicBoolean result = new AtomicBoolean(false);
+coyoteRequest.action(ActionCode.ASYNC_IS_STARTING, result);
+return result.get();
+}
+
@Override
public boolean isAsyncStarted() {
if (asyncContext == null) {
Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1740509&r1=1740508&r2=1740509&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Fri Apr
22 12:57:50 2016
@@ -104,7 +104,7 @@ public class ErrorReportValve extends Va
// CoyoteAdapter will trigger the necessary processing. It is only
// necessary to trigger it here if async is starting (i.e. this is
// the post-processing of the service() method)
-if (throwable != null && request.isAsyncDispatching()) {
+if (throwable != null && request.isAsyncStarting()) {
request.getAsyncContextInternal().setErrorState(throwable,
true);
}
return;
Modified: tomcat/trunk/java/org/apache/coyote/ActionCode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ActionCode.java?rev=1740509&r1=1740508&r2=1740509&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ActionCode.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ActionCode.java Fri Apr 22 12:57:50 2016
@@ -164,6 +164,11 @@ public enum ActionCode {
ASYNC_IS_ASYNC,
/**
+ * Callback to determine if async processing is starting.
+ */
+ASYNC_IS_STARTING,
+
+/**
* Callback to determine if async dispatch is in progress.
*/
ASYNC_IS_STARTED,
Modified: tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1740509&r1=1740508&r2=1740509&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8]
(original)
+++ tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] Fri Apr
22 12:57:50 2016
@@ -179,6 +179,10 @@ public class AsyncStateMachine {
return state.isDispatching();
}
+public boolean isAsyncStarting() {
+return state == AsyncState.STARTING;
+}
+
public boolean isAsyncStarted() {
return state.isStarted();
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1740509&r1=1740508&r2=1740509&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Apr 22
12:57:50 2016
@@ -571,6 +571,10 @@ public class AjpProcessor extends Abstra
((AtomicBoolean) param).set(asyncStateMachine.isAsyncError());
break;
}
+case ASYNC_IS_STARTING: {
+((AtomicBoolean) param).set(asyncStateMachine.isAsyncStarting());
+break;
+}
case ASYNC_IS_STARTED: {
((AtomicBoolean) param).set(asyncStateMachine.isAsyncStarted());
break;
Modified: tomcat/trunk/java/org/apache/coyote
svn commit: r1740510 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/valves/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http
Author: markt
Date: Fri Apr 22 12:58:40 2016
New Revision: 1740510
URL: http://svn.apache.org/viewvc?rev=1740510&view=rev
Log:
Fix regression between first and second parts of fix for BZ 59219
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/ActionCode.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 22 12:58:40 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740509
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1740510&r1=1740509&r2=1740510&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java Fri
Apr 22 12:58:40 2016
@@ -1644,6 +1644,16 @@ public class Request implements org.apac
return asyncContext;
}
+public boolean isAsyncStarting() {
+if (asyncContext == null) {
+return false;
+}
+
+AtomicBoolean result = new AtomicBoolean(false);
+coyoteRequest.action(ActionCode.ASYNC_IS_STARTING, result);
+return result.get();
+}
+
@Override
public boolean isAsyncStarted() {
if (asyncContext == null) {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1740510&r1=1740509&r2=1740510&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Fri Apr 22 12:58:40 2016
@@ -104,7 +104,7 @@ public class ErrorReportValve extends Va
// CoyoteAdapter will trigger the necessary processing. It is only
// necessary to trigger it here if async is starting (i.e. this is
// the post-processing of the service() method)
-if (throwable != null && request.isAsyncDispatching()) {
+if (throwable != null && request.isAsyncStarting()) {
request.getAsyncContextInternal().setErrorState(throwable,
true);
}
return;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/ActionCode.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/ActionCode.java?rev=1740510&r1=1740509&r2=1740510&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/ActionCode.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/ActionCode.java Fri Apr 22
12:58:40 2016
@@ -164,6 +164,11 @@ public enum ActionCode {
ASYNC_IS_ASYNC,
/**
+ * Cal
svn commit: r1740511 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/tribes/Channel.java
Author: markt
Date: Fri Apr 22 12:59:17 2016
New Revision: 1740511
URL: http://svn.apache.org/viewvc?rev=1740511&view=rev
Log:
Fix Javadoc nag
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/Channel.java
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 22 12:59:17 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740509
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/Channel.java?rev=1740511&r1=1740510&r2=1740511&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/Channel.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/Channel.java Fri Apr
22 12:59:17 2016
@@ -365,7 +365,7 @@ public interface Channel {
/**
* Set the name of this channel
- * @param name
+ * @param name The new channel name
*/
public void setName(String name);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1740513 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/valves/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http
Author: markt Date: Fri Apr 22 13:02:18 2016 New Revision: 1740513 URL: http://svn.apache.org/viewvc?rev=1740513&view=rev Log: Fix regression between first and second parts of fix for BZ 59219 Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/ActionCode.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 22 13:02:18 2016 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452 7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,
svn commit: r1740514 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/valves/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http
Author: markt Date: Fri Apr 22 13:03:26 2016 New Revision: 1740514 URL: http://svn.apache.org/viewvc?rev=1740514&view=rev Log: Fix regression between first and second parts of fix for BZ 59219 Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/ActionCode.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 22 13:03:26 2016 @@ -1,3 +1,3 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702 744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1 726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981 +/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-164
[Bug 59219] AsyncListener#onError not called on exception during async processing
https://bz.apache.org/bugzilla/show_bug.cgi?id=59219 --- Comment #10 from Mark Thomas --- I've fixed the regression. I held back on committing the test case to give you a chance to update your proposed 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: r1740520 - in /tomcat/trunk: java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/server/
Author: markt
Date: Fri Apr 22 13:21:43 2016
New Revision: 1740520
URL: http://svn.apache.org/viewvc?rev=1740520&view=rev
Log:
Expand checks for proper WebSocket shutdown
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java?rev=1740520&r1=1740519&r2=1740520&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
Fri Apr 22 13:21:43 2016
@@ -108,6 +108,17 @@ public class BackgroundProcessManager {
}
+void shutdown() {
+synchronized (processesLock) {
+processes.clear();
+if (wsBackgroundThread != null) {
+wsBackgroundThread.halt();
+wsBackgroundThread = null;
+}
+}
+}
+
+
private static class WsBackgroundThread extends Thread {
private final BackgroundProcessManager manager;
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java?rev=1740520&r1=1740519&r2=1740520&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java Fri
Apr 22 13:21:43 2016
@@ -41,5 +41,8 @@ public abstract class WebSocketBaseTest
}
Assert.assertEquals(0,
BackgroundProcessManager.getInstance().getProcessCount());
+
+// Ensure the next test is not affected
+BackgroundProcessManager.getInstance().shutdown();
}
}
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java?rev=1740520&r1=1740519&r2=1740520&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java
Fri Apr 22 13:21:43 2016
@@ -35,12 +35,12 @@ import org.apache.catalina.Context;
import org.apache.catalina.loader.WebappClassLoaderBase;
import org.apache.catalina.servlets.DefaultServlet;
import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.websocket.WebSocketBaseTest;
/**
* Tests endpoint methods are called with the correct class loader.
*/
-public class TestClassLoader extends TomcatBaseTest {
+public class TestClassLoader extends WebSocketBaseTest {
private static final String PASS = "PASS";
private static final String FAIL = "FAIL";
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java?rev=1740520&r1=1740519&r2=1740520&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java Fri Apr
22 13:21:43 2016
@@ -42,14 +42,14 @@ import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.servlets.DefaultServlet;
import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.websocket.WebSocketBaseTest;
/**
* Test the behavior of closing websockets under various conditions.
*/
-public class TestClose extends TomcatBaseTest {
+public class TestClose extends WebSocketBaseTest {
private static Log log = LogFactory.getLog(TestClose.class);
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/serv
svn commit: r1740521 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/server/
Author: markt
Date: Fri Apr 22 13:22:37 2016
New Revision: 1740521
URL: http://svn.apache.org/viewvc?rev=1740521&view=rev
Log:
Expand checks for proper WebSocket shutdown
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 22 13:22:37 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java?rev=1740521&r1=1740520&r2=1740521&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
Fri Apr 22 13:22:37 2016
@@ -108,6 +108,17 @@ public class BackgroundProcessManager {
}
+void shutdown() {
+synchronized (processesLock) {
+processes.clear();
+if (wsBackgroundThread != null) {
+wsBackgroundThread.halt();
+wsBackgroundThread = null;
+}
+}
+}
+
+
private static class WsBackgroundThread extends Thread {
private final BackgroundProcessManager manager;
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java?rev=1740521&r1=1740520&r2=1740521&view=diff
==
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Fri Apr 22 13:22:37 2016
@@ -41,5 +41,8 @@ public abstract class WebSocketBaseTest
}
Assert.assertEquals(0,
BackgroundProcessManager.getInstance().getProcessCount());
+
+// Ensure the next test is not affected
+BackgroundProcessManager.getInstance().shutdown();
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java?rev=1740521&r1=1740520&r2=1740521&view=diff
==
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java
Fri Apr 22 13:
svn commit: r1740522 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/server/
Author: markt Date: Fri Apr 22 13:23:07 2016 New Revision: 1740522 URL: http://svn.apache.org/viewvc?rev=1740522&view=rev Log: Expand checks for proper WebSocket shutdown Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 22 13:23:07 2016 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-16845
svn commit: r1740523 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/server/
Author: markt Date: Fri Apr 22 13:24:13 2016 New Revision: 1740523 URL: http://svn.apache.org/viewvc?rev=1740523&view=rev Log: Expand checks for proper WebSocket shutdown Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 22 13:24:13 2016 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702 744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1 726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513 -/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132 -/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,11901
Re: svn commit: r1740523 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/server/
2016-04-22 16:24 GMT+03:00 :
> Author: markt
> Date: Fri Apr 22 13:24:13 2016
> New Revision: 1740523
>
> URL: http://svn.apache.org/viewvc?rev=1740523&view=rev
> Log:
> Expand checks for proper WebSocket shutdown
>
> Modified:
> tomcat/tc7.0.x/trunk/ (props changed)
>
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
>
> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
>
> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
>
> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java
>
> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
>
> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
>
> Modified:
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
> URL:
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java?rev=1740523&r1=1740522&r2=1740523&view=diff
> ==
> ---
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
> (original)
> +++
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
> Fri Apr 22 13:24:13 2016
> @@ -108,6 +108,17 @@ public class BackgroundProcessManager {
> }
>
>
> +void shutdown() {
> +synchronized (processesLock) {
> +processes.clear();
> +if (wsBackgroundThread != null) {
> +wsBackgroundThread.halt();
> +wsBackgroundThread = null;
> +}
> +}
> +}
> +
> +
> private static class WsBackgroundThread extends Thread {
>
> private final BackgroundProcessManager manager;
>
> Modified:
> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
> URL:
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java?rev=1740523&r1=1740522&r2=1740523&view=diff
> ==
> ---
> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
> (original)
> +++
> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
> Fri Apr 22 13:24:13 2016
> @@ -41,5 +41,8 @@ public abstract class WebSocketBaseTest
> }
>
> Assert.assertEquals(0,
> BackgroundProcessManager.getInstance().getProcessCount());
> +
> +// Ensure the next test is not affected
> +BackgroundProcessManager.getInstance().shutdown();
> }
> }
The above shutdown() call won't help. In case of a failure the Assert
throws an Assert[ion?]Error and shutdown() method won't be called.
It can be moved into a separate method annotated with @After, or into
a finally block.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1740523 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/server/
On 22/04/2016 15:18, Konstantin Kolinko wrote:
> 2016-04-22 16:24 GMT+03:00 :
>> Author: markt
>> Date: Fri Apr 22 13:24:13 2016
>> New Revision: 1740523
>>
>> URL: http://svn.apache.org/viewvc?rev=1740523&view=rev
>> Log:
>> Expand checks for proper WebSocket shutdown
>>
>> Modified:
>> tomcat/tc7.0.x/trunk/ (props changed)
>>
>> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
>>
>> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
>>
>> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
>>
>> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java
>>
>> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
>>
>> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
>>
>
>> Modified:
>> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java?rev=1740523&r1=1740522&r2=1740523&view=diff
>> ==
>> ---
>> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
>> (original)
>> +++
>> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
>> Fri Apr 22 13:24:13 2016
>> @@ -108,6 +108,17 @@ public class BackgroundProcessManager {
>> }
>>
>>
>> +void shutdown() {
>> +synchronized (processesLock) {
>> +processes.clear();
>> +if (wsBackgroundThread != null) {
>> +wsBackgroundThread.halt();
>> +wsBackgroundThread = null;
>> +}
>> +}
>> +}
>> +
>> +
>> private static class WsBackgroundThread extends Thread {
>>
>> private final BackgroundProcessManager manager;
>>
>> Modified:
>> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java?rev=1740523&r1=1740522&r2=1740523&view=diff
>> ==
>> ---
>> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
>> (original)
>> +++
>> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
>> Fri Apr 22 13:24:13 2016
>> @@ -41,5 +41,8 @@ public abstract class WebSocketBaseTest
>> }
>>
>> Assert.assertEquals(0,
>> BackgroundProcessManager.getInstance().getProcessCount());
>> +
>> +// Ensure the next test is not affected
>> +BackgroundProcessManager.getInstance().shutdown();
>> }
>> }
>
> The above shutdown() call won't help. In case of a failure the Assert
> throws an Assert[ion?]Error and shutdown() method won't be called.
>
> It can be moved into a separate method annotated with @After, or into
> a finally block.
Thanks for catching that. I'll go with the finally block so execution
order is clear.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1740535 - /tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Author: markt
Date: Fri Apr 22 15:14:04 2016
New Revision: 1740535
URL: http://svn.apache.org/viewvc?rev=1740535&view=rev
Log:
Make sure the clean-up runs
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java?rev=1740535&r1=1740534&r2=1740535&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java Fri
Apr 22 15:14:04 2016
@@ -40,9 +40,11 @@ public abstract class WebSocketBaseTest
count++;
}
-Assert.assertEquals(0,
BackgroundProcessManager.getInstance().getProcessCount());
-
-// Ensure the next test is not affected
-BackgroundProcessManager.getInstance().shutdown();
+try {
+Assert.assertEquals(0,
BackgroundProcessManager.getInstance().getProcessCount());
+} finally {
+// Ensure the next test is not affected
+BackgroundProcessManager.getInstance().shutdown();
+}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1740536 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Author: markt
Date: Fri Apr 22 15:15:20 2016
New Revision: 1740536
URL: http://svn.apache.org/viewvc?rev=1740536&view=rev
Log:
Ensure clean-up runs
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 22 15:15:20 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java?rev=1740536&r1=1740535&r2=1740536&view=diff
==
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Fri Apr 22 15:15:20 2016
@@ -40,9 +40,11 @@ public abstract class WebSocketBaseTest
count++;
}
-Assert.assertEquals(0,
BackgroundProcessManager.getInstance().getProcessCount());
-
-// Ensure the next test is not affected
-BackgroundProcessManager.getInstance().shutdown();
+try {
+Assert.assertEquals(0,
BackgroundProcessManager.getInstance().getProcessCount());
+} finally {
+// Ensure the next test is not affected
+BackgroundProcessManager.getInstance().shutdown();
+}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1740537 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Author: markt Date: Fri Apr 22 15:15:41 2016 New Revision: 1740537 URL: http://svn.apache.org/viewvc?rev=1740537&view=rev Log: Ensure clean-up runs Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 22 15:15:41 2016 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452 7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1692894,1692896,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,169487
svn commit: r1740538 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Author: markt Date: Fri Apr 22 15:16:28 2016 New Revision: 1740538 URL: http://svn.apache.org/viewvc?rev=1740538&view=rev Log: Ensure clean-up runs Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 22 15:16:28 2016 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702 744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1 726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513 -/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-bio (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-bio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-bio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 54 mins 42 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160422-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160422.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160422-native-src.tar.gz -Dtest.temp=output/test-tmp-BIO -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.ope nssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160422/bin/openssl -Dexecute.test.bio=true -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/out
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 51 mins 58 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160422-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160422.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160422-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.open ssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160422/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/out
[Bug 57559] Decoded Request URI used for Asynchronous dispatch
https://bz.apache.org/bugzilla/show_bug.cgi?id=57559 --- Comment #5 from Mark Thomas --- Thread from EG. -- 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 59317] AsyncContextImpl breaks request URL containing spaces
https://bz.apache.org/bugzilla/show_bug.cgi?id=59317 --- Comment #1 from Mark Thomas --- See also bug 57559. I'm close to marking this bug as a duplicate of that one but I do want to review the detail of exactly what is going on first. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-apr : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 44 mins 2 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-APR -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160422.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=true -Dexec ute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160422-native-src.tar.gz -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160422-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-12/dest-20160422/lib -Dexecute.test.nio=false -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160422.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-nio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 44 mins 4 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-NIO -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160422.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexe cute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160422-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160422-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dexecute.test.nio=true -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160422.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.
[Bug 59219] AsyncListener#onError not called on exception during async processing
https://bz.apache.org/bugzilla/show_bug.cgi?id=59219 Abdessamed MANSOURI changed: What|Removed |Added Attachment #33784|0 |1 is obsolete|| --- Comment #11 from Abdessamed MANSOURI --- Created attachment 33796 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33796&action=edit Unit test of bug 59219 Thank you for your useful feedback and especialy your patience and your time :), i use IntelliJ IDEA Community edition because i'm more familiar with its debugger and its features, i run ant to convert the project to eclipse project then import it inside IDEA as eclipse project (ant buildfile doesn't offer support for IDEA and IDEA supports importing eclipse projects). The test case pass for point 2, but it doesn't for point 3, i noticed that when an exception occurs without a dispatch the onError run once, but if the exception occurs with no matter numbder of dispatch the onError run twice, i think it a bug in the fix as onError should run only once or the same as the dispatch has been called (i didn't read the servlet spec). -- 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: Looking for mentor
I saw your modification on the code, but i really didn't understand the idea behind it, in previous days, i tried to debug it, but really i didn't figure where is the problem, if you have time, just explain to what you have done :) 2016-04-20 11:34 GMT+01:00 Mark Thomas : > On 19/04/2016 23:44, Abdessamed MANSOURI wrote: > > I think, i just have to write a simple test case which is pretty similair > > to TestAsyncContextImpl.testListeners, or not?? :) > > Correct. You are heading in the right direction. > > You can use the existing test cases in TestAsyncContextImpl and the test > case provided in Bug 59219 as a guide. > > There should be a lot of code in TestAsyncContextImpl you can re-use > and/or extend slightly to do what you need. > > Don't worry about your first proposal being perfect. Get something that > works and we can provide you with feedback. Also, don't worry if you get > a lot of feedback and you end up changing most or even all of your > patch. The first patch I proposed was completely unrecognisable by the > time it actually made it into the Tomcat code base. > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-bio (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-bio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-bio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 36 mins 3 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160423-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160423.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160423-native-src.tar.gz -Dtest.temp=output/test-tmp-BIO -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.ope nssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160423/bin/openssl -Dexecute.test.bio=true -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api
[Bug 59369] New: classloader getResourceAsStream throws exception instead of returning NULL.
https://bz.apache.org/bugzilla/show_bug.cgi?id=59369
Bug ID: 59369
Summary: classloader getResourceAsStream throws exception
instead of returning NULL.
Product: Tomcat 9
Version: 9.0.0.M4
Hardware: PC
OS: Mac OS X 10.1
Status: NEW
Severity: major
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: ste...@twelvetone.tv
When using JavaMail and Tomcat 9.0.0.M4
JavaMail checks for META-INF/javamail.providers and
META-INF/javamail.address.map resources on the class loader of the
javax.mail.Authenticator class. If the resources do not exist, a null pointer
exception is thrown instead of returning null.
http://docs.oracle.com/javase/6/docs/api/java/lang/ClassLoader.html#getResourceAsStream(java.lang.String)
Session.getResourceAsStream only catches a PrivilegedActionException. This
causes Session.getInstance to fail.
A fix/workaround involves either
1. putting empty META-INF entries in the jar,
or
2. catching the NPE in Session.getResourceAsStream and re-throwing it as an IO
exception.
java.lang.NullPointerException
at
org.apache.catalina.loader.WebappClassLoaderBase.getResourceAsStream(WebappClassLoaderBase.java:1089)
at java.lang.Class.getResourceAsStream(Class.java:2223)
at javax.mail.Session$4.run(Session.java:1232)
at javax.mail.Session$4.run(Session.java:1230)
at java.security.AccessController.doPrivileged(Native Method)
at javax.mail.Session.getResourceAsStream(Session.java:1229)
at javax.mail.Session.loadResource(Session.java:1123)
at javax.mail.Session.loadAllResources(Session.java:1203)
at javax.mail.Session.loadProviders(Session.java:934)
at javax.mail.Session.(Session.java:224)
at javax.mail.Session.getInstance(Session.java:251)
JavaMail Workaround
try {
return AccessController.doPrivileged(
new PrivilegedExceptionAction() {
public InputStream run() throws IOException {
try {
return c.getResourceAsStream(name);
} catch (Exception e) {
throw new IOException(e);
}
}
}
);
} catch (PrivilegedActionException e) {
throw (IOException)e.getException();
}
}
filed on JavaMail as well
https://kenai.com/bugzilla/show_bug.cgi?id=7356
--
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
