svn commit: r1682320 - in /tomcat/trunk/java/org/apache/tomcat/dbcp/pool2: ./ impl/BaseGenericObjectPool.java impl/GenericKeyedObjectPool.java impl/GenericKeyedObjectPoolConfig.java impl/GenericObject
Author: markt
Date: Thu May 28 20:09:07 2015
New Revision: 1682320
URL: http://svn.apache.org/r1682320
Log:
Update Commons Pool fork to 2.4.0
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ (props changed)
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPoolConfig.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java
Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 28 20:09:07 2015
@@ -1 +1 @@
-/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2:1593516-1648905
+/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2:1593516-1682319
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java?rev=1682320r1=1682319r2=1682320view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
Thu May 28 20:09:07 2015
@@ -21,6 +21,7 @@ import java.io.StringWriter;
import java.io.Writer;
import java.lang.management.ManagementFactory;
import java.lang.ref.WeakReference;
+import java.util.Deque;
import java.util.Iterator;
import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicLong;
@@ -89,7 +90,7 @@ public abstract class BaseGenericObjectP
volatile boolean closed = false;
final Object evictionLock = new Object();
private Evictor evictor = null; // @GuardedBy(evictionLock)
-IteratorPooledObjectT evictionIterator = null; //
@GuardedBy(evictionLock)
+EvictionIterator evictionIterator = null; // @GuardedBy(evictionLock)
/*
* Class loader for evictor thread to use since, in a JavaEE or similar
* environment, the context class loader for the evictor thread may not
have
@@ -583,7 +584,9 @@ public abstract class BaseGenericObjectP
/**
* Sets the name of the {@link EvictionPolicy} implementation that is
- * used by this pool.
+ * used by this pool. The Pool will attempt to load the class using the
+ * thread context class loader. If that fails, the Pool will attempt to
load
+ * the class using the class loader that loaded this class.
*
* @param evictionPolicyClassName the fully qualified class name of the
* new eviction policy
@@ -593,8 +596,13 @@ public abstract class BaseGenericObjectP
public final void setEvictionPolicyClassName(
String evictionPolicyClassName) {
try {
-Class? clazz = Class.forName(evictionPolicyClassName, true,
-Thread.currentThread().getContextClassLoader());
+Class? clazz;
+try {
+clazz = Class.forName(evictionPolicyClassName, true,
+Thread.currentThread().getContextClassLoader());
+} catch (ClassNotFoundException e) {
+clazz = Class.forName(evictionPolicyClassName);
+}
Object policy = clazz.newInstance();
if (policy instanceof EvictionPolicy?) {
@SuppressWarnings(unchecked) // safe, because we just
checked the class
@@ -645,9 +653,11 @@ public abstract class BaseGenericObjectP
/**
* Returns the {@link EvictionPolicy} defined for this pool.
+ *
* @return the eviction policy
+ * @since 2.4
*/
-final EvictionPolicyT getEvictionPolicy() {
+protected EvictionPolicyT getEvictionPolicy() {
return evictionPolicy;
}
@@ -1098,4 +1108,96 @@ public abstract class BaseGenericObjectP
return (long) result;
}
}
+
+/**
+ * The idle object eviction iterator. Holds a reference to the idle
objects.
+ */
+class EvictionIterator implements IteratorPooledObjectT {
+
+private final DequePooledObjectT idleObjects;
+private final IteratorPooledObjectT idleObjectIterator;
+
+/**
+ * Create an EvictionIterator for the provided idle instance deque.
+ * @param idleObjects underlying deque
+ */
+EvictionIterator(final DequePooledObjectT idleObjects) {
+this.idleObjects = idleObjects;
+
+if (getLifo()) {
+idleObjectIterator = idleObjects.descendingIterator();
+} else {
+idleObjectIterator = idleObjects.iterator();
+}
+}
+
+/**
+ * Returns the idle object deque referenced by this
svn commit: r1682326 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/fileupload/ java/org/apache/tomcat/util/http/fileupload/disk/ webapps/docs/
Author: markt Date: Thu May 28 20:33:45 2015 New Revision: 1682326 URL: http://svn.apache.org/r1682326 Log: Update fork of Commons FileUpload from r1596086 to r1682322 to pick the 1.3.1 release and subsequent fixes. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 28 20:33:45 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,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 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
svn commit: r1682332 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/codec/ java/org/apache/tomcat/util/codec/binary/ webapps/docs/
Author: markt Date: Thu May 28 20:43:15 2015 New Revision: 1682332 URL: http://svn.apache.org/r1682332 Log: Update fork of Apache Commons codec from r1609340 to r1682326. Javadoc fixes only. No functional change. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/DecoderException.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/EncoderException.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/binary/StringUtils.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 28 20:43:15 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,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 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
svn commit: r1682330 - in /tomcat/trunk/java/org/apache/tomcat/util/codec: ./ DecoderException.java EncoderException.java binary/Base64.java binary/BaseNCodec.java binary/StringUtils.java
Author: markt
Date: Thu May 28 20:39:26 2015
New Revision: 1682330
URL: http://svn.apache.org/r1682330
Log:
Update fork of Apache Commons codec from r1609340 to r1682326.
Javadoc fixes only. No functional change.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/codec/ (props changed)
tomcat/trunk/java/org/apache/tomcat/util/codec/DecoderException.java
tomcat/trunk/java/org/apache/tomcat/util/codec/EncoderException.java
tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java
tomcat/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
tomcat/trunk/java/org/apache/tomcat/util/codec/binary/StringUtils.java
Propchange: tomcat/trunk/java/org/apache/tomcat/util/codec/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 28 20:39:26 2015
@@ -1 +1 @@
-/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec:1459201-1609340
+/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec:1459201-1682326
Modified: tomcat/trunk/java/org/apache/tomcat/util/codec/DecoderException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/codec/DecoderException.java?rev=1682330r1=1682329r2=1682330view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/codec/DecoderException.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/codec/DecoderException.java Thu
May 28 20:39:26 2015
@@ -30,7 +30,7 @@ public class DecoderException extends Ex
private static final long serialVersionUID = 1L;
/**
- * Constructs a new exception with {@code null} as its detail message. The
cause is not initialized, and may
+ * Constructs a new exception with codenull/code as its detail
message. The cause is not initialized, and may
* subsequently be initialized by a call to {@link #initCause}.
*
* @since 1.4
@@ -59,7 +59,7 @@ public class DecoderException extends Ex
* @param message
*The detail message which is saved for later retrieval by the
{@link #getMessage()} method.
* @param cause
- *The cause which is saved for later retrieval by the {@link
#getCause()} method. A {@code null}
+ *The cause which is saved for later retrieval by the {@link
#getCause()} method. A codenull/code
*value is permitted, and indicates that the cause is
nonexistent or unknown.
* @since 1.4
*/
@@ -73,7 +73,7 @@ public class DecoderException extends Ex
* This constructor is useful for exceptions that are little more than
wrappers for other throwables.
*
* @param cause
- *The cause which is saved for later retrieval by the {@link
#getCause()} method. A {@code null}
+ *The cause which is saved for later retrieval by the {@link
#getCause()} method. A codenull/code
*value is permitted, and indicates that the cause is
nonexistent or unknown.
* @since 1.4
*/
Modified: tomcat/trunk/java/org/apache/tomcat/util/codec/EncoderException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/codec/EncoderException.java?rev=1682330r1=1682329r2=1682330view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/codec/EncoderException.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/codec/EncoderException.java Thu
May 28 20:39:26 2015
@@ -31,7 +31,7 @@ public class EncoderException extends Ex
private static final long serialVersionUID = 1L;
/**
- * Constructs a new exception with {@code null} as its detail message. The
cause is not initialized, and may
+ * Constructs a new exception with codenull/code as its detail
message. The cause is not initialized, and may
* subsequently be initialized by a call to {@link #initCause}.
*
* @since 1.4
@@ -62,7 +62,7 @@ public class EncoderException extends Ex
* @param message
*The detail message which is saved for later retrieval by the
{@link #getMessage()} method.
* @param cause
- *The cause which is saved for later retrieval by the {@link
#getCause()} method. A {@code null}
+ *The cause which is saved for later retrieval by the {@link
#getCause()} method. A codenull/code
*value is permitted, and indicates that the cause is
nonexistent or unknown.
* @since 1.4
*/
@@ -76,7 +76,7 @@ public class EncoderException extends Ex
* This constructor is useful for exceptions that are little more than
wrappers for other throwables.
*
* @param cause
- *The cause which is saved for later retrieval by the {@link
#getCause()} method. A {@code null}
+ *The cause which is saved for later retrieval by
svn commit: r1682319 - /tomcat/trunk/TOMCAT-NEXT.txt
Author: markt Date: Thu May 28 20:04:03 2015 New Revision: 1682319 URL: http://svn.apache.org/r1682319 Log: Update Modified: tomcat/trunk/TOMCAT-NEXT.txt Modified: tomcat/trunk/TOMCAT-NEXT.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1682319r1=1682318r2=1682319view=diff == --- tomcat/trunk/TOMCAT-NEXT.txt (original) +++ tomcat/trunk/TOMCAT-NEXT.txt Thu May 28 20:04:03 2015 @@ -29,7 +29,8 @@ Notes of things to consider for the next - All implementation specific per connector code - Endpoint - All implementation specific per connection code - SocketWrapper - 5. SNI support for JSSE. + 5. DONE +SNI support for JSSE. 6. See what Java 8 language features we want to use. @@ -39,7 +40,8 @@ Notes of things to consider for the next 8. Keep an eye on the other Java EE 8 EGs (no sign of any movement apart from the Servlet EG so far). - 9. Refactor WebSocket I/O to go directly to Tomcat's internals rather than via + 9. DONE +Refactor WebSocket I/O to go directly to Tomcat's internals rather than via the Servlet API. 10. Remove the use of system properties to control configuration wherever - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682324 - in /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload: ./ FileUploadBase.java ParameterParser.java disk/DiskFileItem.java
Author: markt
Date: Thu May 28 20:29:15 2015
New Revision: 1682324
URL: http://svn.apache.org/r1682324
Log:
Update fork of Commons FileUpload from r1596086 to r1682322 to pick thew 1.3.1
release and subsequent fixes.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ (props changed)
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
Propchange: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 28 20:29:15 2015
@@ -1 +1 @@
-/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload:1-1596086
+/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload:1-1682322
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java?rev=1682324r1=1682323r2=1682324view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
Thu May 28 20:29:15 2015
@@ -311,8 +311,8 @@ public abstract class FileUploadBase {
for (FileItem fileItem : items) {
try {
fileItem.delete();
-} catch (Exception e) {
-// ignore it
+} catch (Exception ignored) {
+// ignored TODO perhaps add to tracker delete failure
list somehow?
}
}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java?rev=1682324r1=1682323r2=1682324view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
Thu May 28 20:29:15 2015
@@ -76,8 +76,8 @@ public class ParameterParser {
/**
* Are there any characters left to parse?
*
- * @return tttrue/tt if there are unparsed characters,
- * ttfalse/tt otherwise.
+ * @return {@code true} if there are unparsed characters,
+ * {@code false} otherwise.
*/
private boolean hasChar() {
return this.pos this.len;
@@ -88,8 +88,8 @@ public class ParameterParser {
* leading and trailing blanks as well as enclosing quotation marks,
* when necessary.
*
- * @param quoted tttrue/tt if quotation marks are expected,
- * ttfalse/tt otherwise.
+ * @param quoted {@code true} if quotation marks are expected,
+ * {@code false} otherwise.
* @return the token
*/
private String getToken(boolean quoted) {
@@ -122,8 +122,8 @@ public class ParameterParser {
* @param ch the character to test for presense in the array of characters
* @param charray the array of characters to test against
*
- * @return tttrue/tt if the character is present in the array of
- * characters, ttfalse/tt otherwise.
+ * @return {@code true} if the character is present in the array of
+ * characters, {@code false} otherwise.
*/
private boolean isOneOf(char ch, final char[] charray) {
boolean result = false;
@@ -193,12 +193,12 @@ public class ParameterParser {
}
/**
- * Returns tttrue/tt if parameter names are to be converted to lower
+ * Returns {@code true} if parameter names are to be converted to lower
* case when name/value pairs are parsed.
*
- * @return tttrue/tt if parameter names are to be
+ * @return {@code true} if parameter names are to be
* converted to lower case when name/value pairs are parsed.
- * Otherwise returns ttfalse/tt
+ * Otherwise returns {@code false}
*/
public boolean isLowerCaseNames() {
return this.lowerCaseNames;
@@ -208,9 +208,9 @@ public class ParameterParser {
* Sets the flag if parameter names are to be converted to lower case when
* name/value pairs are parsed.
*
- * @param b tttrue/tt if parameter names are to be
+ * @param b {@code true} if parameter names are to be
* converted to lower case when name/value pairs are parsed.
- * ttfalse/tt otherwise.
+ * {@code false} otherwise.
*/
public void setLowerCaseNames(boolean b) {
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1290 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1682330 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682318 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/dbcp/dbcp2/ java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ java/org/apache/tomcat/dbcp/dbcp2/datasources/ webapps/docs/
Author: markt Date: Thu May 28 20:02:42 2015 New Revision: 1682318 URL: http://svn.apache.org/r1682318 Log: Update DBCP fork to DBCP 2.1 + additional fixes to r1682314 Added: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/LifetimeExceededException.java - copied unchanged from r1682317, tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LifetimeExceededException.java Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings.properties tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableCallableStatement.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/SwallowedExceptionLogger.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/Utils.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionManager.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 28 20:02:42 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,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,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
buildbot success in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/280 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1682322 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682322 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/dbcp/pool2/ java/org/apache/tomcat/dbcp/pool2/impl/ webapps/docs/
Author: markt Date: Thu May 28 20:10:13 2015 New Revision: 1682322 URL: http://svn.apache.org/r1682322 Log: Update Commons Pool fork to 2.4.0 Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPoolConfig.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 28 20:10:13 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,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,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317
svn commit: r1682325 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/http/fileupload/ java/org/apache/tomcat/util/http/fileupload/disk/ webapps/docs/
Author: markt Date: Thu May 28 20:31:12 2015 New Revision: 1682325 URL: http://svn.apache.org/r1682325 Log: Update fork of Commons FileUpload from r1596086 to r1682322 to pick thew 1.3.1 release and subsequent fixes. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 28 20:31:12 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,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,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320
svn commit: r1682331 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/codec/ java/org/apache/tomcat/util/codec/binary/ webapps/docs/
Author: markt Date: Thu May 28 20:42:01 2015 New Revision: 1682331 URL: http://svn.apache.org/r1682331 Log: Update fork of Apache Commons codec from r1609340 to r1682326. Javadoc fixes only. No functional change. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/DecoderException.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/EncoderException.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/StringUtils.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 28 20:42:01 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,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,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324
[Bug 57969] New: @PathParam annotation captures incorrect value under high load
https://bz.apache.org/bugzilla/show_bug.cgi?id=57969
Bug ID: 57969
Summary: @PathParam annotation captures incorrect value under
high load
Product: Tomcat 7
Version: 7.0.59
Hardware: PC
OS: Linux
Status: NEW
Severity: major
Priority: P2
Component: WebSocket
Assignee: dev@tomcat.apache.org
Reporter: peter_kova...@hotmail.com
Under high load, given a @ServerEndpoint like
@ServerEndpoint(value=/websocket/{key}, configurator=MyConfigurator.class)
public class ExecutionMonitoringEndpoint{
...
@OnMessage
public void onMessage(@PathParam(key) String key, String payload) {
...
}
}
//where MyConfigurator is used to only inject a custom property like
ServerEndpointConfig.conf.getUserProperties().put(...);
we noticed that the captured PathParam (key in this case) was sometimes mixed
up with another concurrent request - causing double subscriptions in our
pub/sub application.
Changing the above to
@ServerEndpoint(value=/websocket/{key}, configurator=MyConfigurator.class)
public class ExecutionMonitoringEndpoint{
...
@OnMessage
public void onMessage(Session session, String payload) {
String key = session.getPathParameters().get(key);
}
}
fixed the problem.
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682312 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/bcel/ java/org/apache/tomcat/util/bcel/classfile/ webapps/docs/
Author: markt Date: Thu May 28 19:15:45 2015 New Revision: 1682312 URL: http://svn.apache.org/r1682312 Log: Merge BCEL changes from r1614166 to r1682271 The changes consist of: - code clean-up - Javadoc tweaks - some renaming There are no functional changes Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/package.html tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 28 19:15:45 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,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,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1
svn commit: r1682317 - in /tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2: ./ datasources/
Author: markt
Date: Thu May 28 19:57:56 2015
New Revision: 1682317
URL: http://svn.apache.org/r1682317
Log:
Update DBCP fork to DBCP 2.1 + additional fixes to r1682314
Added:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LifetimeExceededException.java
- copied, changed from r1682314,
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/LifetimeExceededException.java
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/ (props changed)
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableCallableStatement.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/SwallowedExceptionLogger.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/Utils.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionManager.java
Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 28 19:57:56 2015
@@ -1 +1 @@
-/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:1593516-1631451
+/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:1593516-1682314
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java?rev=1682317r1=1682316r2=1682317view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java Thu May
28 19:57:56 2015
@@ -31,8 +31,10 @@ import java.sql.SQLFeatureNotSupportedEx
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Properties;
+import java.util.Set;
import java.util.logging.Logger;
import javax.management.InstanceAlreadyExistsException;
@@ -65,7 +67,7 @@ import org.apache.tomcat.dbcp.pool2.impl
* @author Dirk Verbeeck
* @since 2.0
*/
-public class BasicDataSource implements DataSource, BasicDataSourceMXBean,
MBeanRegistration {
+public class BasicDataSource implements DataSource, BasicDataSourceMXBean,
MBeanRegistration, AutoCloseable {
private static final Log log = LogFactory.getLog(BasicDataSource.class);
@@ -973,9 +975,11 @@ public class BasicDataSource implements
* @return the current number of active connections
*/
@Override
-public synchronized int getNumActive() {
-if (connectionPool != null) {
-return connectionPool.getNumActive();
+public int getNumActive() {
+// Copy reference to avoid NPE if close happens after null check
+GenericObjectPoolPoolableConnection pool = connectionPool;
+if (pool != null) {
+return pool.getNumActive();
}
return 0;
}
@@ -988,9 +992,11 @@ public class BasicDataSource implements
* @return the current number of idle connections
*/
@Override
-public synchronized int getNumIdle() {
-if (connectionPool != null) {
-return connectionPool.getNumIdle();
+public int getNumIdle() {
+// Copy reference to avoid NPE if close happens after null check
+GenericObjectPoolPoolableConnection pool = connectionPool;
+if (pool != null) {
+return pool.getNumIdle();
}
return 0;
}
@@ -1267,6 +1273,20 @@ public class BasicDataSource implements
return maxConnLifetimeMillis;
}
+private boolean logExpiredConnections = true;
+
+/**
+ * When {@link #getMaxConnLifetimeMillis()} is set to limit connection
lifetime,
+ * this property determines whether or not log messages are generated when
the
+ * pool closes connections due to maximum lifetime exceeded.
+ *
+ * @since 2.1
+ */
+@Override
+public boolean getLogExpiredConnections() {
+return
svn commit: r1682315 - in /tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter: ConnectionImpl.java DriverAdapterCPDS.java PooledConnectionImpl.java
Author: markt
Date: Thu May 28 19:40:25 2015
New Revision: 1682315
URL: http://svn.apache.org/r1682315
Log: (empty)
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java?rev=1682315r1=1682314r2=1682315view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java
Thu May 28 19:40:25 2015
@@ -51,7 +51,7 @@ class ConnectionImpl extends DelegatingC
*
* @param pooledConnection The PooledConnection that is calling the ctor.
* @param connection The JDBC 1.x Connection to wrap.
- * @param accessToUnderlyingConnectionAllowed if true, then access is
allowed to the underlying connectiion
+ * @param accessToUnderlyingConnectionAllowed if true, then access is
allowed to the underlying connection
*/
ConnectionImpl(PooledConnectionImpl pooledConnection,
Connection connection,
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java?rev=1682315r1=1682314r2=1682315view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
Thu May 28 19:40:25 2015
@@ -684,7 +684,7 @@ public class DriverAdapterCPDS
}
/**
- * Returns the maximun number of prepared statements.
+ * Returns the maximum number of prepared statements.
*
* @return maxPrepartedStatements value
*/
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java?rev=1682315r1=1682314r2=1682315view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
Thu May 28 19:40:25 2015
@@ -407,7 +407,7 @@ class PooledConnectionImpl implements Po
/**
* Normalize the given SQL statement, producing a
- * cannonical form that is semantically equivalent to the original.
+ * canonical form that is semantically equivalent to the original.
*/
protected String normalizeSQL(String sql) {
return sql.trim();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a build exception on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/278 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1682312 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682313 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/bcel/ java/org/apache/tomcat/util/bcel/classfile/ webapps/docs/
Author: markt Date: Thu May 28 19:22:12 2015 New Revision: 1682313 URL: http://svn.apache.org/r1682313 Log: Merge BCEL changes from r1614166 to r1682271 The changes consist of: - code clean-up - Javadoc tweaks - some renaming There are no functional changes Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/package.html tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 28 19:22:12 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,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 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
svn commit: r1682311 - in /tomcat/trunk/java/org/apache/tomcat/util/bcel: ./ classfile/
Author: markt
Date: Thu May 28 19:12:19 2015
New Revision: 1682311
URL: http://svn.apache.org/r1682311
Log:
Merge BCEL changes from r1614166 to r1682271
The changes consist of:
- code clean-up
- Javadoc tweaks
- some renaming
There are no functional changes
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/package.html
Propchange: tomcat/trunk/java/org/apache/tomcat/util/bcel/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 28 19:12:19 2015
@@ -1,2 +1,2 @@
-/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:1149512-1614166
+/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:1149512-1682271
/jakarta/bcel/trunk/src/main/java/org/apache/bcel:886845-1149511
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=1682311r1=1682310r2=1682311view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java Thu May 28
19:12:19 2015
@@ -24,7 +24,11 @@ package org.apache.tomcat.util.bcel;
*/
public interface Constants {
- /** One of the access flags for fields, methods, or classes.
+ /**
+ * One of the access flags for fields, methods, or classes.
+ * @see a
href='http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.5'Flag
definitions for Fields in the Java Virtual Machine Specification (Java SE 8
Edition)./a
+ * @see a
href='http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.6'Flag
definitions for Methods in the Java Virtual Machine Specification (Java SE 8
Edition)./a
+ * @see a
href='http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.6-300-D.1-D.1'Flag
definitions for Classes in the Java Virtual Machine Specification (Java SE 8
Edition)./a
*/
public static final short ACC_FINAL= 0x0010;
@@ -90,5 +94,4 @@ public interface Constants {
CONSTANT_Methodref, CONSTANT_InterfaceMethodref,
CONSTANT_NameAndType, , , CONSTANT_MethodHandle,
CONSTANT_MethodType, , CONSTANT_InvokeDynamic };
-
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=1682311r1=1682310r2=1682311view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
Thu May 28 19:12:19 2015
@@ -40,20 +40,20 @@ public class AnnotationEntry implements
/**
* Creates an AnnotationEntry from a DataInputStream
*
- * @param file
+ * @param input
* @param constant_pool
* @throws IOException
*/
-AnnotationEntry(DataInput file, ConstantPool constant_pool) throws
IOException {
+AnnotationEntry(DataInput input, ConstantPool constant_pool) throws
IOException {
this.constant_pool = constant_pool;
-type_index = file.readUnsignedShort();
-int num_element_value_pairs = file.readUnsignedShort();
+type_index = input.readUnsignedShort();
+int num_element_value_pairs = input.readUnsignedShort();
element_value_pairs = new ArrayList(num_element_value_pairs);
for (int i = 0; i num_element_value_pairs; i++) {
-element_value_pairs.add(new ElementValuePair(file, constant_pool));
+element_value_pairs.add(new ElementValuePair(input,
constant_pool));
}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java?rev=1682311r1=1682310r2=1682311view=diff
[Bug 57971] New: Description of recoverySleepTime doesn't correspond with the implementation
https://bz.apache.org/bugzilla/show_bug.cgi?id=57971 Bug ID: 57971 Summary: Description of recoverySleepTime doesn't correspond with the implementation Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: t.bessho0...@gmail.com Created attachment 32765 -- https://bz.apache.org/bugzilla/attachment.cgi?id=32765action=edit patch against trunk. Description of recoverySleepTime attribute in Membership doc says ...until we either recovered successfully or we have reached the recoveryCounter limit. However, there is no until reached the recoveryCounter limit in the implementation. I fix the document to match the implementation. -- 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: r1682164 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/AbstractHttp11Protocol.java
Author: markt
Date: Thu May 28 08:06:37 2015
New Revision: 1682164
URL: http://svn.apache.org/r1682164
Log:
Pull up longPoll() to the base Protocol implementation
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1682164r1=1682163r2=1682164view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Thu May 28
08:06:37 2015
@@ -831,8 +831,22 @@ public abstract class AbstractProtocolS
}
protected abstract P createProcessor();
-protected abstract void longPoll(SocketWrapperBase? socket,
-Processor processor);
+
+
+protected void longPoll(SocketWrapperBase? socket, Processor
processor) {
+if (processor.isAsync()) {
+// Async
+socket.setAsync(true);
+} else {
+// This branch is currently only used with HTTP
+// Either:
+// - this is an upgraded connection
+// - the request line/headers have not been completely
+//read
+socket.registerReadInterest();
+}
+}
+
/**
* Expected to be used by the handler once the processor is no longer
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1682164r1=1682163r2=1682164view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Thu May 28
08:06:37 2015
@@ -21,7 +21,6 @@ import java.nio.ByteBuffer;
import javax.servlet.http.HttpUpgradeHandler;
import org.apache.coyote.AbstractProtocol;
-import org.apache.coyote.Processor;
import org.apache.coyote.UpgradeProtocol;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SSLHostConfig;
@@ -168,11 +167,6 @@ public abstract class AbstractAjpProtoco
return processor;
}
-@Override
-protected void longPoll(SocketWrapperBase? socket, Processor
processor) {
-// Same requirements for all AJP connectors
-socket.setAsync(true);
-}
@Override
protected AjpProcessor createUpgradeProcessor(SocketWrapperBase?
socket,
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1682164r1=1682163r2=1682164view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
May 28 08:06:37 2015
@@ -627,20 +627,5 @@ public abstract class AbstractHttp11Prot
return new UpgradeProcessorExternal(socket, leftoverInput,
httpUpgradeHandler);
}
}
-
-
-@Override
-protected void longPoll(SocketWrapperBase? socket, Processor
processor) {
-if (processor.isAsync()) {
-// Async
-socket.setAsync(true);
-} else {
-// Either:
-// - this is an upgraded connection
-// - the request line/headers have not been completely
-//read
-socket.registerReadInterest();
-}
-}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682167 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Protocol.java Http11AprProtocol.java Http11Nio2Protocol.java Http11NioProtocol.java
Author: markt
Date: Thu May 28 08:23:01 2015
New Revision: 1682167
URL: http://svn.apache.org/r1682167
Log:
Pull up release()
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1682167r1=1682166r2=1682167view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
May 28 08:23:01 2015
@@ -627,5 +627,16 @@ public abstract class AbstractHttp11Prot
return new UpgradeProcessorExternal(socket, leftoverInput,
httpUpgradeHandler);
}
}
+
+
+@Override
+public void release(SocketWrapperBaseS socket,
+Processor processor, boolean addToPoller) {
+processor.recycle();
+recycledProcessors.push(processor);
+if (addToPoller) {
+socket.registerReadInterest();
+}
+}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1682167r1=1682166r2=1682167view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Thu May
28 08:23:01 2015
@@ -16,11 +16,9 @@
*/
package org.apache.coyote.http11;
-import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.AprEndpoint;
-import org.apache.tomcat.util.net.SocketWrapperBase;
/**
@@ -94,15 +92,5 @@ public class Http11AprProtocol extends A
protected Log getLog() {
return log;
}
-
-@Override
-public void release(SocketWrapperBaseLong socket,
-Processor processor, boolean addToPoller) {
-processor.recycle();
-recycledProcessors.push(processor);
-if (addToPoller) {
-socket.registerReadInterest();
-}
-}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1682167r1=1682166r2=1682167view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Thu May
28 08:23:01 2015
@@ -90,17 +90,6 @@ public class Http11Nio2Protocol extends
@Override
-public void release(SocketWrapperBaseNio2Channel socket,
-Processor processor, boolean addToPoller) {
-processor.recycle();
-recycledProcessors.push(processor);
-if (addToPoller) {
-socket.registerReadInterest();
-}
-}
-
-
-@Override
public void closeAll() {
for (Nio2Channel channel : connections.keySet()) {
((Nio2Endpoint)
getProtocol().getEndpoint()).closeSocket(channel.getSocket());
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1682167r1=1682166r2=1682167view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Thu May
28 08:23:01 2015
@@ -145,16 +145,5 @@ public class Http11NioProtocol extends A
recycledProcessors.push(processor);
}
}
-
-
-@Override
-public void release(SocketWrapperBaseNioChannel socket,
-Processor processor, boolean addToPoller) {
-processor.recycle();
-recycledProcessors.push(processor);
-if (addToPoller) {
-socket.registerReadInterest();
-}
-}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682163 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/AbstractHttp11Protocol.java http11/Http11AprProtocol.java http11/Http11Nio2Pro
Author: markt
Date: Thu May 28 08:02:10 2015
New Revision: 1682163
URL: http://svn.apache.org/r1682163
Log:
Pull up longPoll()
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1682163r1=1682162r2=1682163view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Thu May 28
08:02:10 2015
@@ -831,7 +831,7 @@ public abstract class AbstractProtocolS
}
protected abstract P createProcessor();
-protected abstract void longPoll(SocketWrapperBaseS socket,
+protected abstract void longPoll(SocketWrapperBase? socket,
Processor processor);
/**
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1682163r1=1682162r2=1682163view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Thu May 28
08:02:10 2015
@@ -169,7 +169,7 @@ public abstract class AbstractAjpProtoco
}
@Override
-protected void longPoll(SocketWrapperBaseS socket, Processor
processor) {
+protected void longPoll(SocketWrapperBase? socket, Processor
processor) {
// Same requirements for all AJP connectors
socket.setAsync(true);
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1682163r1=1682162r2=1682163view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
May 28 08:02:10 2015
@@ -37,6 +37,7 @@ import org.apache.coyote.UpgradeProtocol
import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler;
import org.apache.coyote.http11.upgrade.UpgradeProcessorExternal;
import org.apache.coyote.http11.upgrade.UpgradeProcessorInternal;
+//import org.apache.coyote.http2.Http2Protocol;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -626,5 +627,20 @@ public abstract class AbstractHttp11Prot
return new UpgradeProcessorExternal(socket, leftoverInput,
httpUpgradeHandler);
}
}
+
+
+@Override
+protected void longPoll(SocketWrapperBase? socket, Processor
processor) {
+if (processor.isAsync()) {
+// Async
+socket.setAsync(true);
+} else {
+// Either:
+// - this is an upgraded connection
+// - the request line/headers have not been completely
+//read
+socket.registerReadInterest();
+}
+}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1682163r1=1682162r2=1682163view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Thu May
28 08:02:10 2015
@@ -104,19 +104,5 @@ public class Http11AprProtocol extends A
socket.registerReadInterest();
}
}
-
-@Override
-protected void longPoll(SocketWrapperBaseLong socket, Processor
processor) {
-if (processor.isAsync()) {
-// Async
-socket.setAsync(true);
-} else {
-// Either:
-// - this is an upgraded connection
-// - the request line/headers have not been completely
-//read
-socket.registerReadInterest();
-}
-}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
[Bug 57959] Deadlock in FileHandler.java when log is rotated
https://bz.apache.org/bugzilla/show_bug.cgi?id=57959 Violeta Georgieva violet...@apache.org changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #1 from Violeta Georgieva violet...@apache.org --- Thanks for the report. The fix is provided for Tomcat 7 trunk and will be available with 7.0.63 onwards. Regards, Violeta -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 9 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-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-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 43 mins 59 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.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150528-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150528.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150528-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20150528/bin/o penssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-util.jar:/srv
svn propchange: r1682152 - svn:log
Author: violetagg Revision: 1682152 Modified property: svn:log Modified: svn:log at Thu May 28 06:57:30 2015 -- --- svn:log (original) +++ svn:log Thu May 28 06:57:30 2015 @@ -1,2 +1,3 @@ +Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57959 Partially merged revision 1582064 from tomcat/tc8.0.x/trunk: Fixed deadlock in org.apache.juli.FileHandler when log is rotated. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 9 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 39 mins 38 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.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150528-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150528.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150528-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20150528/bi n/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat
svn commit: r1682152 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/juli/FileHandler.java webapps/docs/changelog.xml
Author: violetagg Date: Thu May 28 06:54:35 2015 New Revision: 1682152 URL: http://svn.apache.org/r1682152 Log: Partially merged revision 1582064 from tomcat/tc8.0.x/trunk: Fixed deadlock in org.apache.juli.FileHandler when log is rotated. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/juli/FileHandler.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 28 06:54:35 2015 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,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 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/661 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1682152 Blamelist: violetagg Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 41 mins 16 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.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150528-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150528/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150528.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150528-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150528/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-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.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv
svn commit: r1682184 - /tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
Author: markt
Date: Thu May 28 09:37:40 2015
New Revision: 1682184
URL: http://svn.apache.org/r1682184
Log:
No need to set the keep-alive timeout. It has already been set in the Processor
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1682184r1=1682183r2=1682184view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Thu May 28
09:37:40 2015
@@ -90,7 +90,6 @@ public class AjpAprProtocol extends Abst
processor.recycle();
recycledProcessors.push(processor);
if (addToPoller) {
-
socket.setReadTimeout(getProtocol().getEndpoint().getKeepAliveTimeout());
socket.registerReadInterest();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682206 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11Nio2Protocol.java Http11NioProtocol.java
Author: markt
Date: Thu May 28 11:10:25 2015
New Revision: 1682206
URL: http://svn.apache.org/r1682206
Log:
Align release(SocketWrapper) for NIO and NIO2
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1682206r1=1682205r2=1682206view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Thu May
28 11:10:25 2015
@@ -73,14 +73,14 @@ public class Http11Nio2Protocol extends
}
/**
- * Expected to be used by the Poller to release resources on socket
+ * Expected to be used by the Endpoint to release resources on socket
* close, errors etc.
*/
@Override
-public void release(SocketWrapperBaseNio2Channel socket) {
-Nio2Channel channel = socket.getSocket();
-if (channel != null) {
-Processor processor = connections.remove(channel);
+public void release(SocketWrapperBaseNio2Channel socketWrapper) {
+Nio2Channel socket = socketWrapper.getSocket();
+if (socket != null) {
+Processor processor = connections.remove(socket);
if (processor != null) {
processor.recycle();
recycledProcessors.push(processor);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1682206r1=1682205r2=1682206view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Thu May
28 11:10:25 2015
@@ -134,15 +134,18 @@ public class Http11NioProtocol extends A
}
/**
- * Expected to be used by the Poller to release resources on socket
+ * Expected to be used by the Endpoint to release resources on socket
* close, errors etc.
*/
@Override
-public void release(SocketWrapperBaseNioChannel socket) {
-Processor processor = connections.remove(socket.getSocket());
-if (processor != null) {
-processor.recycle();
-recycledProcessors.push(processor);
+public void release(SocketWrapperBaseNioChannel socketWrapper) {
+NioChannel socket = socketWrapper.getSocket();
+if (socket != null) {
+Processor processor = connections.remove(socket);
+if (processor != null) {
+processor.recycle();
+recycledProcessors.push(processor);
+}
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682205 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: markt
Date: Thu May 28 11:10:03 2015
New Revision: 1682205
URL: http://svn.apache.org/r1682205
Log:
Fix typo
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1682205r1=1682204r2=1682205view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu May 28
11:10:03 2015
@@ -255,7 +255,7 @@ public class Nio2Endpoint extends Abstra
for (SocketWrapperBaseNio2Channel socket :
waitingRequests) {
processSocket(socket, SocketStatus.TIMEOUT, false);
}
-// Then close all active connections if any remains
+// Then close all active connections if any remain
try {
handler.closeAll();
} catch (Throwable t) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57966] Tomcat 8 (8.0.22/ 8.0.23) + Java 8.0.45 failed to compile the JSPs - java.io.IOException: tmpFile.renameTo(classFile) failed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57966 --- Comment #3 from Anoop Kumar anoopayth...@gmail.com --- Full Stack Trace given below Unable to compile class for JSP org.apache.jasper.JasperException: Unable to compile class for JSP at org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:600) at org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:363) at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:396) at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:340) at javax.servlet.http.HttpServlet.service(HttpServlet.java:729) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:291) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:721) at org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:584) at org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:523) at org.apache.jasper.runtime.JspRuntimeLibrary.include(JspRuntimeLibrary.java:934) at org.apache.jsp.WEB_002dINF.jsp.decorators.htmlShell_jsp._jspService(htmlShell_jsp.java:656) at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70) at javax.servlet.http.HttpServlet.service(HttpServlet.java:729) at org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:438) at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:396) at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:340) at javax.servlet.http.HttpServlet.service(HttpServlet.java:729) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:291) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:721) at org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:584) at org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:523) at com.opensymphony.module.sitemesh.filter.PageFilter.writeDecorator(PageFilter.java:173) at com.opensymphony.module.sitemesh.filter.PageFilter.applyDecorator(PageFilter.java:158) at com.financial.ngp.web.filter.NgpPageFilter.doFilter(NgpPageFilter.java:60) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at com.financial.ngp.web.filter.GZipFilter.doFilter(GZipFilter.java:87) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at com.financial.ngp.web.filter.P3pFilter.doFilter(P3pFilter.java:49) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:219) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:106) at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:502) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:142) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:79) at org.apache.catalina.valves.AbstractAccessLogValve.invoke(AbstractAccessLogValve.java:617) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:88) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:518) at org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:1091) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:668) at org.apache.tomcat.util.net.AprEndpoint$SocketProcessor.doRun(AprEndpoint.java:2463) at org.apache.tomcat.util.net.AprEndpoint$SocketProcessor.run(AprEndpoint.java:2452) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.lang.Thread.run(Thread.java:745) Caused by: java.io.IOException: tmpFile.renameTo(classFile) failed at org.apache.jasper.compiler.SmapUtil$SDEInstaller.install(SmapUtil.java:205) at org.apache.jasper.compiler.SmapUtil.installSmap(SmapUtil.java:163) at org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:465) at org.apache.jasper.compiler.Compiler.compile(Compiler.java:361) at org.apache.jasper.compiler.Compiler.compile(Compiler.java:336) at org.apache.jasper.compiler.Compiler.compile(Compiler.java:323) at
svn commit: r1682189 - in /tomcat/trunk/java/org/apache/coyote/ajp: AbstractAjpProtocol.java AjpAprProtocol.java AjpNio2Protocol.java AjpNioProtocol.java
Author: markt
Date: Thu May 28 09:42:13 2015
New Revision: 1682189
URL: http://svn.apache.org/r1682189
Log:
Pull up release()
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1682189r1=1682188r2=1682189view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Thu May 28
09:42:13 2015
@@ -21,6 +21,7 @@ import java.nio.ByteBuffer;
import javax.servlet.http.HttpUpgradeHandler;
import org.apache.coyote.AbstractProtocol;
+import org.apache.coyote.Processor;
import org.apache.coyote.UpgradeProtocol;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SSLHostConfig;
@@ -174,5 +175,17 @@ public abstract class AbstractAjpProtoco
// TODO should fail - throw IOE
return null;
}
+
+
+
+@Override
+public void release(SocketWrapperBaseS socket,
+Processor processor, boolean addToPoller) {
+processor.recycle();
+recycledProcessors.push(processor);
+if (addToPoller) {
+socket.registerReadInterest();
+}
+}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1682189r1=1682188r2=1682189view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Thu May 28
09:42:13 2015
@@ -16,11 +16,9 @@
*/
package org.apache.coyote.ajp;
-import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.AprEndpoint;
-import org.apache.tomcat.util.net.SocketWrapperBase;
/**
@@ -83,15 +81,5 @@ public class AjpAprProtocol extends Abst
protected Log getLog() {
return log;
}
-
-@Override
-public void release(SocketWrapperBaseLong socket,
-Processor processor, boolean addToPoller) {
-processor.recycle();
-recycledProcessors.push(processor);
-if (addToPoller) {
-socket.registerReadInterest();
-}
-}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1682189r1=1682188r2=1682189view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Thu May 28
09:42:13 2015
@@ -64,11 +64,13 @@ public class AjpNio2Protocol extends Abs
super(proto);
}
+
@Override
protected Log getLog() {
return log;
}
+
/**
* Expected to be used by the Poller to release resources on socket
* close, errors etc.
@@ -82,15 +84,6 @@ public class AjpNio2Protocol extends Abs
}
}
-@Override
-public void release(SocketWrapperBaseNio2Channel socket,
-Processor processor, boolean addToPoller) {
-processor.recycle();
-recycledProcessors.push(processor);
-if (addToPoller) {
-socket.registerReadInterest();
-}
-}
@Override
public void closeAll() {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1682189r1=1682188r2=1682189view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Thu May 28
09:42:13 2015
@@ -110,16 +110,5 @@ public class AjpNioProtocol extends Abst
recycledProcessors.push(processor);
}
}
-
-
-@Override
-public void release(SocketWrapperBaseNioChannel socket,
- Processor processor, boolean addToPoller) {
-processor.recycle();
-recycledProcessors.push(processor);
-if (addToPoller) {
-
svn commit: r1682194 - in /tomcat/trunk: java/org/apache/coyote/ajp/AjpAprProtocol.java java/org/apache/coyote/http11/Http11AprProtocol.java webapps/docs/config/ajp.xml webapps/docs/config/http.xml
Author: markt
Date: Thu May 28 09:53:36 2015
New Revision: 1682194
URL: http://svn.apache.org/r1682194
Log:
Remove APR specific pollerSize (it is a synonym for the general maxConnections)
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/webapps/docs/config/ajp.xml
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1682194r1=1682193r2=1682194view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Thu May 28
09:53:36 2015
@@ -55,10 +55,6 @@ public class AjpAprProtocol extends Abst
public int getPollTime() { return
((AprEndpoint)getEndpoint()).getPollTime(); }
public void setPollTime(int pollTime) {
((AprEndpoint)getEndpoint()).setPollTime(pollTime); }
-// pollerSize is now a synonym for maxConnections
-public void setPollerSize(int pollerSize) {
getEndpoint().setMaxConnections(pollerSize); }
-public int getPollerSize() { return getEndpoint().getMaxConnections(); }
-
// - JMX related
methods
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1682194r1=1682193r2=1682194view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Thu May
28 09:53:36 2015
@@ -54,9 +54,6 @@ public class Http11AprProtocol extends A
public int getPollTime() { return
((AprEndpoint)getEndpoint()).getPollTime(); }
public void setPollTime(int pollTime) {
((AprEndpoint)getEndpoint()).setPollTime(pollTime); }
-public void setPollerSize(int pollerSize) {
getEndpoint().setMaxConnections(pollerSize); }
-public int getPollerSize() { return getEndpoint().getMaxConnections(); }
-
public int getSendfileSize() { return
((AprEndpoint)getEndpoint()).getSendfileSize(); }
public void setSendfileSize(int sendfileSize) {
((AprEndpoint)getEndpoint()).setSendfileSize(sendfileSize); }
Modified: tomcat/trunk/webapps/docs/config/ajp.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1682194r1=1682193r2=1682194view=diff
==
--- tomcat/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/trunk/webapps/docs/config/ajp.xml Thu May 28 09:53:36 2015
@@ -706,13 +706,6 @@
/p
/attribute
-attribute name=pollerSize required=false
- pAmount of sockets that the poller responsible for polling kept alive
- connections can hold at a given time. Extra connections will be closed
- right away. The default value is 8192, corresponding to 8192 keep-alive
- connections./p
-/attribute
-
/attributes
/subsection
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1682194r1=1682193r2=1682194view=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Thu May 28 09:53:36 2015
@@ -867,13 +867,6 @@
otherwise it is codefalse/code./p
/attribute
- attribute name=pollerSize required=false
-pAmount of sockets that the poller responsible for polling kept alive
-connections can hold at a given time. Extra connections will be closed
-right away. The default value is 8192, corresponding to 8192 keep-alive
-connections. This is a synonym for maxConnections./p
- /attribute
-
attribute name=pollerThreadCount required=false
pNumber of threads used to poll kept alive connections. On Windows
the
default is chosen so that the sockets managed by each thread is
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682190 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/AbstractHttp11Protocol.java
Author: markt
Date: Thu May 28 09:45:03 2015
New Revision: 1682190
URL: http://svn.apache.org/r1682190
Log:
Pull up release() to base Protocol class
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1682190r1=1682189r2=1682190view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Thu May 28
09:45:03 2015
@@ -859,12 +859,20 @@ public abstract class AbstractProtocolS
* @param addToPoller Should the socket be added to the poller for
*reading
*/
-protected abstract void release(SocketWrapperBaseS socket,
-Processor processor, boolean addToPoller);
+public void release(SocketWrapperBaseS socket, Processor processor,
boolean addToPoller) {
+processor.recycle();
+recycledProcessors.push(processor);
+if (addToPoller) {
+socket.registerReadInterest();
+}
+}
+
+
protected abstract Processor createUpgradeProcessor(
SocketWrapperBase? socket, ByteBuffer leftoverInput,
HttpUpgradeHandler httpUpgradeHandler) throws IOException;
+
protected void register(AbstractProcessor processor) {
if (getProtocol().getDomain() != null) {
synchronized (this) {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1682190r1=1682189r2=1682190view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Thu May 28
09:45:03 2015
@@ -21,7 +21,6 @@ import java.nio.ByteBuffer;
import javax.servlet.http.HttpUpgradeHandler;
import org.apache.coyote.AbstractProtocol;
-import org.apache.coyote.Processor;
import org.apache.coyote.UpgradeProtocol;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SSLHostConfig;
@@ -175,17 +174,5 @@ public abstract class AbstractAjpProtoco
// TODO should fail - throw IOE
return null;
}
-
-
-
-@Override
-public void release(SocketWrapperBaseS socket,
-Processor processor, boolean addToPoller) {
-processor.recycle();
-recycledProcessors.push(processor);
-if (addToPoller) {
-socket.registerReadInterest();
-}
-}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1682190r1=1682189r2=1682190view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
May 28 09:45:03 2015
@@ -627,16 +627,5 @@ public abstract class AbstractHttp11Prot
return new UpgradeProcessorExternal(socket, leftoverInput,
httpUpgradeHandler);
}
}
-
-
-@Override
-public void release(SocketWrapperBaseS socket,
-Processor processor, boolean addToPoller) {
-processor.recycle();
-recycledProcessors.push(processor);
-if (addToPoller) {
-socket.registerReadInterest();
-}
-}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57966] Tomcat 8 (8.0.22/ 8.0.23) + Java 8.0.45 failed to compile the JSPs - java.io.IOException: tmpFile.renameTo(classFile) failed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57966 --- Comment #2 from Violeta Georgieva violet...@apache.org --- Hi, Please provide also a sample JSP that can be used to reproduce the issue. I tested Tomcat 8.0.23 with Java SE 8.0.45 and also JSP Servlet configuration below and Tomcat's JSP examples are working without any problems. init-param param-namecompilerSourceVM/param-name param-value1.8/param-value /init-param init-param param-namecompilerTargetVM/param-name param-value1.8/param-value /init-param Regards, Violeta -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57966] Tomcat 8 (8.0.22/ 8.0.23) + Java 8.0.45 failed to compile the JSPs - java.io.IOException: tmpFile.renameTo(classFile) failed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57966 --- Comment #4 from Rainer Jung rainer.j...@kippdata.de --- Assuming this happens for you on Windows: there's a list of external reasons that can make this happen, including real-time virus scanning and long path names. Could you check, how long the path name for your tomcat work directory is and also do a little retest with switched off real-time virus scanning? Any changes you have made to the configuration of the jsp servlet in the tomcat conf/web.xml? And as Violeta already said: a self-contained reproduction case would be great. Thanks Rainer -- 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: r1682186 - /tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
Author: markt
Date: Thu May 28 09:40:16 2015
New Revision: 1682186
URL: http://svn.apache.org/r1682186
Log:
Align release() for NIO2 with NIO and APR.
- remove (non-i18n) debug message
- register for read if necessary (likely to be a NO-OP for NIO2 + AJP)
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1682186r1=1682185r2=1682186view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Thu May 28
09:40:16 2015
@@ -85,12 +85,11 @@ public class AjpNio2Protocol extends Abs
@Override
public void release(SocketWrapperBaseNio2Channel socket,
Processor processor, boolean addToPoller) {
-if (getLog().isDebugEnabled()) {
-log.debug(Socket: [ + socket + ], Processor: [ + processor
+
-], addToPoller: [ + addToPoller + ]);
-}
processor.recycle();
recycledProcessors.push(processor);
+if (addToPoller) {
+socket.registerReadInterest();
+}
}
@Override
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 9 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 37 mins 32 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.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150528-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20150528/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150528.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150528-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20150528/bin/openssl -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat
[Bug 57966] Tomcat 8 (8.0.22/ 8.0.23) + Java 8.0.45 failed to compile the JSPs - java.io.IOException: tmpFile.renameTo(classFile) failed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57966 Mark Thomas ma...@apache.org changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas ma...@apache.org --- Full stack trace please -- 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 57966] New: Tomcat 8 (8.0.22/ 8.0.23) + Java 8.0.45 failed to compile the JSPs - java.io.IOException: tmpFile.renameTo(classFile) failed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57966 Bug ID: 57966 Summary: Tomcat 8 (8.0.22/ 8.0.23) + Java 8.0.45 failed to compile the JSPs - java.io.IOException: tmpFile.renameTo(classFile) failed Product: Tomcat 8 Version: 8.0.23 Hardware: PC Status: NEW Severity: blocker Priority: P2 Component: Jasper Assignee: dev@tomcat.apache.org Reporter: anoopayth...@gmail.com Tomcat 8 failed to compile the JSPs java.io.IOException: tmpFile.renameTo(classFile) failed Looks like tomcat is not able to or not doing enough to rename a the compiled jsp temporary class file (.classtmp) to a class file I can see .classtemp files in the work directory. If I manually rename them everything is fine . The problem noticed in version Tomcat 8.0.22 and Tomcat 8.0.23 with Java 8.0.45 No issues in version Tomcat 8.0.22 and Tomcat 8.0.23 with Java 8.0.31 Tomcat 8.0.20 works fine with both versions of the Java I cleaned the work folder but this happens all the time. -- 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 57966] Tomcat 8 (8.0.22/ 8.0.23) + Java 8.0.45 failed to compile the JSPs - java.io.IOException: tmpFile.renameTo(classFile) failed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57966 Violeta Georgieva violet...@apache.org changed: What|Removed |Added Status|NEW |NEEDINFO -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682240 - in /tomcat/trunk/java/org/apache: coyote/ coyote/ajp/ coyote/http11/ tomcat/util/net/
Author: markt
Date: Thu May 28 13:25:52 2015
New Revision: 1682240
URL: http://svn.apache.org/r1682240
Log:
Fix various errors when stopping the APR connector via JMX (may occur in other
scenarios)
- prevent a crash by ensuring all connections are closed via the SocketWrapper
- prevent a memory leak by releasing any Processor associated with a closed
connection
Adds release(SocketWrapper) to the Handler interface and adds an implementation
to the base AbstractProtocol.AbstractConnectionHandler (replacing the impl. in
vaious sub-classes)
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1682240r1=1682239r2=1682240view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Thu May 28
13:25:52 2015
@@ -868,6 +868,23 @@ public abstract class AbstractProtocolS
}
+/**
+ * Expected to be used by the Endpoint to release resources on socket
+ * close, errors etc.
+ */
+@Override
+public void release(SocketWrapperBaseS socketWrapper) {
+S socket = socketWrapper.getSocket();
+if (socket != null) {
+Processor processor = connections.remove(socket);
+if (processor != null) {
+processor.recycle();
+recycledProcessors.push(processor);
+}
+}
+}
+
+
protected abstract Processor createUpgradeProcessor(
SocketWrapperBase? socket, ByteBuffer leftoverInput,
HttpUpgradeHandler httpUpgradeHandler) throws IOException;
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1682240r1=1682239r2=1682240view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Thu May 28
13:25:52 2015
@@ -16,13 +16,11 @@
*/
package org.apache.coyote.ajp;
-import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.Nio2Channel;
import org.apache.tomcat.util.net.Nio2Endpoint;
import org.apache.tomcat.util.net.Nio2Endpoint.Handler;
-import org.apache.tomcat.util.net.SocketWrapperBase;
/**
@@ -71,20 +69,6 @@ public class AjpNio2Protocol extends Abs
}
-/**
- * Expected to be used by the Poller to release resources on socket
- * close, errors etc.
- */
-@Override
-public void release(SocketWrapperBaseNio2Channel socket) {
-Processor processor = connections.remove(socket.getSocket());
-if (processor != null) {
-processor.recycle();
-recycledProcessors.push(processor);
-}
-}
-
-
@Override
public void closeAll() {
for (Nio2Channel channel : connections.keySet()) {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1682240r1=1682239r2=1682240view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Thu May 28
13:25:52 2015
@@ -25,7 +25,6 @@ import org.apache.juli.logging.LogFactor
import org.apache.tomcat.util.net.NioChannel;
import org.apache.tomcat.util.net.NioEndpoint;
import org.apache.tomcat.util.net.NioEndpoint.Handler;
-import org.apache.tomcat.util.net.SocketWrapperBase;
/**
* This the NIO based protocol handler implementation for AJP.
@@ -96,19 +95,5 @@ public class AjpNioProtocol extends Abst
log.debug(sm.getString(ajpnioprotocol.releaseEnd,
socket, Boolean.valueOf(released)));
}
-
-
-/**
- * Expected to be used by the Poller to
svn commit: r1682247 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: markt
Date: Thu May 28 13:53:32 2015
New Revision: 1682247
URL: http://svn.apache.org/r1682247
Log:
Update comment
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1682247r1=1682246r2=1682247view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu May 28
13:53:32 2015
@@ -1530,11 +1530,11 @@ public class NioEndpoint extends Abstrac
try {
if (socket.getPoller().cancelledKey(key) !=
null) {
// SocketWrapper (attachment) was removed
from the
-// key - recycle both. This can only
happen once
+// key - recycle the key. This can only
happen once
// per attempted closure so it is used to
determine
-// whether or not to return socket and ka
to
-// their respective caches. We do NOT want
to do
-// this more than once - see BZ 57340.
+// whether or not to return the key to the
cache.
+// We do NOT want to do this more than
once - see BZ
+// 57340.
if (running !paused) {
nioChannels.push(socket);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request: Recursively create document base directory
GitHub user lvarvel opened a pull request: https://github.com/apache/tomcat/pull/20 Recursively create document base directory The expand method will create the docBase directory, however sometimes this fails because the intermediate webapps directory has not been created already. This will create the intermediate directory if it hasn't already been created externally. You can merge this pull request into a Git repository by running: $ git pull https://github.com/lvarvel/tomcat trunk Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tomcat/pull/20.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #20 commit 7370de6d03ee6e1bfa53c732f281508bde5b893f Author: L. David Varvel da...@varvel.net Date: 2015-05-28T14:22:08Z Recursively create document base directory The expand method will create the docBase directory, however sometimes this fails because the intermediate webapps directory has not been created already. This will create the intermediate directory if it hasn't already been created externally. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request: Recursively create document base directory
Github user markt-asf commented on the pull request: https://github.com/apache/tomcat/pull/20#issuecomment-106360093 Starting Tomcat with an appBase that is not an existing directory is an error and is reported as such in the logs. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682261 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AbstractJsseEndpoint.java jsse/JSSEKeyManager.java jsse/JSSESocketFactory.java jsse/NioX509KeyManager.java
Author: markt
Date: Thu May 28 15:28:34 2015
New Revision: 1682261
URL: http://svn.apache.org/r1682261
Log:
JSSEKeyManager and NioX509KeyManager were doing exactly the same thing and we
were wrapping KeyManager instances twice. Remove the NioX509KeyManager
completely and only wrap once. Also remove unnecessary duplicated Javadoc
comments.
Removed:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/NioX509KeyManager.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1682261r1=1682260r2=1682261view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Thu
May 28 15:28:34 2015
@@ -16,16 +16,11 @@
*/
package org.apache.tomcat.util.net;
-import java.util.Locale;
-
-import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLParameters;
import javax.net.ssl.SSLSessionContext;
-import javax.net.ssl.X509KeyManager;
import org.apache.tomcat.util.net.SSLHostConfig.Type;
-import org.apache.tomcat.util.net.jsse.NioX509KeyManager;
public abstract class AbstractJsseEndpointS extends AbstractEndpointS {
@@ -72,9 +67,9 @@ public abstract class AbstractJsseEndpoi
for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
SSLUtil sslUtil = sslImplementation.getSSLUtil(sslHostConfig);
+
SSLContext sslContext = sslUtil.createSSLContext();
-sslContext.init(wrap(sslUtil.getKeyManagers(), sslHostConfig),
-sslUtil.getTrustManagers(), null);
+sslContext.init(sslUtil.getKeyManagers(),
sslUtil.getTrustManagers(), null);
SSLSessionContext sessionContext =
sslContext.getServerSessionContext();
if (sessionContext != null) {
@@ -130,26 +125,6 @@ public abstract class AbstractJsseEndpoi
}
-private KeyManager[] wrap(KeyManager[] managers, SSLHostConfig
sslHostConfig) {
-if (managers==null) return null;
-KeyManager[] result = new KeyManager[managers.length];
-for (int i=0; iresult.length; i++) {
-if (managers[i] instanceof X509KeyManager
-sslHostConfig.getCertificateKeyAlias() != null) {
-String keyAlias = sslHostConfig.getCertificateKeyAlias();
-// JKS keystores always convert the alias name to lower case
-if
(jks.equalsIgnoreCase(sslHostConfig.getCertificateKeystoreType())) {
-keyAlias = keyAlias.toLowerCase(Locale.ENGLISH);
-}
-result[i] = new NioX509KeyManager((X509KeyManager)
managers[i], keyAlias);
-} else {
-result[i] = managers[i];
-}
-}
-return result;
-}
-
-
private static class SSLContextWrapper {
private final SSLContext sslContext;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java?rev=1682261r1=1682260r2=1682261view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java Thu
May 28 15:28:34 2015
@@ -38,6 +38,7 @@ public final class JSSEKeyManager extend
private X509KeyManager delegate;
private String serverKeyAlias;
+
/**
* Constructor.
*
@@ -51,137 +52,72 @@ public final class JSSEKeyManager extend
this.serverKeyAlias = serverKeyAlias;
}
+
/**
- * Choose an alias to authenticate the client side of a secure socket,
- * given the public key type and the list of certificate issuer authorities
- * recognized by the peer (if any).
- *
- * @param keyType The key algorithm type name(s), ordered with the
- * most-preferred key type first
- * @param issuers The list of acceptable CA issuer subject names, or null
- * if it does not matter which issuers are used
- * @param socket The socket to be used for this connection. This parameter
- * can be null, in which case this method will return the most generic
- * alias to use
- *
- * @return The alias name for the desired key, or null if there are no
- * matches
+ * Returns the server key alias that was provided in the constructor or the
+ * result from
Re: Supporting multiple certificates
Mark, On 5/27/15 4:56 AM, Mark Thomas wrote: On 26/05/2015 08:28, Mark Thomas wrote: On 25/05/2015 15:18, Rainer Jung wrote: snip/ Mark has been doing a whole lot of work recently to both unify the TLS configuration across all connectors (OpenSSL and JSSE) as well as support SNI. Since it's all changing, this would be a good time to either add some new configuration attributes (-0 for me) or to change the format of the certificate (or whatever) value to support multiple values. I'm +1 for something like comma-separated multi-valued, like this: SSLHostConfig ... certificateFile=/path/to/rsa.pem, , /path/to/ec.pem Note the double-comma, indicating that there is no DSA certificate in this example. Actually only the first certificate has a special meaning. AFAIK the one with the RSA key has to come first, DSA (very rarely used) and EC(DSA) (should become more popular) can come after without any special ordering and without any problem if one or both are missing. New server key types can turn up in the future and then the number could grow. Presumably this doesn't just affect the certificate. It also affects the key and the certificate chain. Allowing all of these to be multi-valued is going to create configuration complexity - particularly since order is going to have to be maintained across multiple attributes. In future we may also need to know the type of certificate. I'm leaning towards a nested Certificate .../ element under SSLHostConfig. Does Java support this sort of thing? I need to check but I suspect not. It doesn't but... We could easily extend the hack we used for SNI as follows: 1. When parsing the client hello, remember the cipher suites the client asked for (currently we just skip over them). 2. Filter the server supported cipher suites for each SSLHostConfig based on which certificate types are available. 3. When doing selecting the SSLHostConfig and more than one certificate is present identify the preferred cipher suite (if server order: first cipher in server list that client supports; if client order: first cipher in client list that server supports) and from that select the appropriate certificate. And bingo, we can support RSA, DSA, ECC and whatever is next type certs in parallel. I'll add an enhancement for Tomcat 9 to support this. +1 This is the way to go IMO. -chris signature.asc Description: OpenPGP digital signature
