buildbot success in ASF Buildbot on tomcat-7-trunk

[buildbot]

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/279

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] 1722931
Blamelist: kkolinko

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722946 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ java/org/apache/catalina/storeconfig/ java/org/apache/catalina/util/

[markt]

Author: markt
Date: Mon Jan  4 19:38:59 2016
New Revision: 1722946

URL: http://svn.apache.org/viewvc?rev=1722946=rev
Log:
Remove InstanceListener, InstanceEvent and InstanceSupport

Removed:
tomcat/trunk/java/org/apache/catalina/InstanceEvent.java
tomcat/trunk/java/org/apache/catalina/InstanceListener.java
tomcat/trunk/java/org/apache/catalina/storeconfig/InstanceListenerSF.java
tomcat/trunk/java/org/apache/catalina/util/InstanceSupport.java
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/Wrapper.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
tomcat/trunk/test/org/apache/tomcat/unittest/TesterContext.java
tomcat/trunk/webapps/docs/funcspecs/mbean-names.xml

Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1722946=1722945=1722946=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Mon Jan  4 19:38:59 2016
@@ -811,17 +811,6 @@ public interface Context extends Contain
  */
 public void addFilterMapBefore(FilterMap filterMap);
 
-/**
- * Add the classname of an InstanceListener to be added to each
- * Wrapper appended to this Context.
- *
- * @param listener Java class name of an InstanceListener class
- *
- * @deprecated Will be removed in 9.0.x onwards
- */
-@Deprecated
-public void addInstanceListener(String listener);
-
 
 /**
  * Add a Locale Encoding Mapping (see Sec 5.4 of Servlet spec 2.4)
@@ -1004,16 +993,6 @@ public interface Context extends Contain
 
 
 /**
- * Return the set of InstanceListener classes that will be added to
- * newly created Wrappers automatically.
- *
- * @deprecated Will be removed in 9.0.x onwards
- */
-@Deprecated
-public String[] findInstanceListeners();
-
-
-/**
  * Return the MIME type to which the specified extension is mapped,
  * if any; otherwise return null.
  *
@@ -1232,18 +1211,6 @@ public interface Context extends Contain
 
 
 /**
- * Remove a class name from the set of InstanceListener classes that
- * will be added to newly created Wrappers.
- *
- * @param listener Class name of an InstanceListener class to be removed
- *
- * @deprecated Will be removed in 9.0.x onwards
- */
-@Deprecated
-public void removeInstanceListener(String listener);
-
-
-/**
  * Remove the MIME mapping for the specified extension, if it exists;
  * otherwise, no action is taken.
  *

Modified: tomcat/trunk/java/org/apache/catalina/Wrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Wrapper.java?rev=1722946=1722945=1722946=diff
==
--- tomcat/trunk/java/org/apache/catalina/Wrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Wrapper.java Mon Jan  4 19:38:59 2016
@@ -171,17 +171,6 @@ public interface Wrapper extends Contain
 
 
 /**
- * Add a new listener interested in InstanceEvents.
- *
- * @param listener The new listener
- *
- * @deprecated Will be removed in 9.0.x onwards
- */
-@Deprecated
-public void addInstanceListener(InstanceListener listener);
-
-
-/**
  * Add a mapping associated with the Wrapper.
  *
  * @param mapping The new wrapper mapping
@@ -293,17 +282,6 @@ public interface Wrapper extends Contain
 
 
 /**
- * Remove a listener no longer interested in InstanceEvents.
- *
- * @param listener The listener to remove
- *
- * @deprecated Will be removed in 9.0.x onwards
- */
-@Deprecated
-public void removeInstanceListener(InstanceListener listener);
-
-
-/**
  * Remove a mapping associated with the wrapper.
  *
  * @param mapping The pattern to remove

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1722946=1722945=1722946=diff

buildbot failure in ASF Buildbot on tomcat-8-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-8-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-8-trunk/builds/384

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] 1722948
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722944 - in /tomcat/trunk/java/org/apache/tomcat/util/net/openssl: OpenSSLContext.java OpenSSLEngine.java

[markt]

Author: markt
Date: Mon Jan  4 19:16:05 2016
New Revision: 1722944

URL: http://svn.apache.org/viewvc?rev=1722944=rev
Log:
Fix a couple of IDE warnings

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1722944=1722943=1722944=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
Mon Jan  4 19:16:05 2016
@@ -171,6 +171,7 @@ public class OpenSSLContext implements o
 }
 }
 
+@Override
 public synchronized void destroy() {
 // Guard against multiple destroyPools() calls triggered by 
construction exception and finalize() later
 if (DESTROY_UPDATER.compareAndSet(this, 0, 1)) {

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1722944=1722943=1722944=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java Mon 
Jan  4 19:16:05 2016
@@ -906,7 +906,7 @@ public final class OpenSSLEngine extends
 if (error != SSL.SSL_ERROR_NONE) {
 String err = SSL.getErrorString(error);
 if (logger.isDebugEnabled()) {
-logger.debug(sm.getString("engine.openSSLError", error, err));
+logger.debug(sm.getString("engine.openSSLError", 
Long.toString(error), err));
 }
 // Many errors can occur during handshake and need to be reported
 if (!handshakeFinished) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722950 - /tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java

[markt]

Author: markt
Date: Mon Jan  4 19:44:38 2016
New Revision: 1722950

URL: http://svn.apache.org/viewvc?rev=1722950=rev
Log:
Fix remaining Javadoc warning for tests

Modified:

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java?rev=1722950=1722949=1722950=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java
 Mon Jan  4 19:44:38 2016
@@ -105,13 +105,11 @@ public class TestJdbcInterceptorConfigPa
 assertEquals(emptyParmValProps.get("parm1").getValue(), "");
 }
 
-/**
+/*
  * Some of these should probably be handled more cleanly by the parser, 
but a few known
  * exception scenarios are presented here just to document current 
behavior.  In many cases
  * failure in parsing will just be propagated to a definition that will 
fail later
  * when instantiated.  Should we be failing faster (and with more detail)?
- *
- * @throws Exception
  */
 @Test
 public void testExceptionOrNot() throws Exception {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722949 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java

[markt]

Author: markt
Date: Mon Jan  4 19:43:26 2016
New Revision: 1722949

URL: http://svn.apache.org/viewvc?rev=1722949=rev
Log:
Remove a now unused warning

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java?rev=1722949=1722948=1722949=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java Mon 
Jan  4 19:43:26 2016
@@ -43,7 +43,6 @@ import org.apache.tomcat.util.res.String
  *
  * @author Craig R. McClanahan
  */
-@SuppressWarnings("deprecation")
 final class ApplicationFilterChain implements FilterChain {
 
 // Used to enforce requirements of SRV.8.2 / SRV.14.2.5.1



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722945 - in /tomcat/trunk/java/org/apache/catalina: ./ core/ storeconfig/ util/

[markt]

Author: markt
Date: Mon Jan  4 19:19:29 2016
New Revision: 1722945

URL: http://svn.apache.org/viewvc?rev=1722945=rev
Log:
Deprecate InstanceListener, InstanceEvent and InstanceSupport prior to removal

Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/InstanceEvent.java
tomcat/trunk/java/org/apache/catalina/InstanceListener.java
tomcat/trunk/java/org/apache/catalina/Wrapper.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/storeconfig/InstanceListenerSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/util/InstanceSupport.java

Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1722945=1722944=1722945=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Mon Jan  4 19:19:29 2016
@@ -816,7 +816,10 @@ public interface Context extends Contain
  * Wrapper appended to this Context.
  *
  * @param listener Java class name of an InstanceListener class
+ *
+ * @deprecated Will be removed in 9.0.x onwards
  */
+@Deprecated
 public void addInstanceListener(String listener);
 
 
@@ -1003,7 +1006,10 @@ public interface Context extends Contain
 /**
  * Return the set of InstanceListener classes that will be added to
  * newly created Wrappers automatically.
+ *
+ * @deprecated Will be removed in 9.0.x onwards
  */
+@Deprecated
 public String[] findInstanceListeners();
 
 
@@ -1230,7 +1236,10 @@ public interface Context extends Contain
  * will be added to newly created Wrappers.
  *
  * @param listener Class name of an InstanceListener class to be removed
+ *
+ * @deprecated Will be removed in 9.0.x onwards
  */
+@Deprecated
 public void removeInstanceListener(String listener);
 
 

Modified: tomcat/trunk/java/org/apache/catalina/InstanceEvent.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/InstanceEvent.java?rev=1722945=1722944=1722945=diff
==
--- tomcat/trunk/java/org/apache/catalina/InstanceEvent.java (original)
+++ tomcat/trunk/java/org/apache/catalina/InstanceEvent.java Mon Jan  4 
19:19:29 2016
@@ -33,7 +33,10 @@ import javax.servlet.ServletResponse;
  * as opposed to the Wrapper component that manages it.
  *
  * @author Craig R. McClanahan
+ *
+ * @deprecated Will be removed in 9.0.x onwards
  */
+@Deprecated
 public final class InstanceEvent extends EventObject {
 
 private static final long serialVersionUID = 1L;

Modified: tomcat/trunk/java/org/apache/catalina/InstanceListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/InstanceListener.java?rev=1722945=1722944=1722945=diff
==
--- tomcat/trunk/java/org/apache/catalina/InstanceListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/InstanceListener.java Mon Jan  4 
19:19:29 2016
@@ -25,7 +25,10 @@ package org.apache.catalina;
  * is managing that instance.
  *
  * @author Craig R. McClanahan
+ *
+ * @deprecated Will be removed in 9.0.x onwards
  */
+@Deprecated
 public interface InstanceListener {
 
 

Modified: tomcat/trunk/java/org/apache/catalina/Wrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Wrapper.java?rev=1722945=1722944=1722945=diff
==
--- tomcat/trunk/java/org/apache/catalina/Wrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Wrapper.java Mon Jan  4 19:19:29 2016
@@ -174,7 +174,10 @@ public interface Wrapper extends Contain
  * Add a new listener interested in InstanceEvents.
  *
  * @param listener The new listener
+ *
+ * @deprecated Will be removed in 9.0.x onwards
  */
+@Deprecated
 public void addInstanceListener(InstanceListener listener);
 
 
@@ -293,7 +296,10 @@ public interface Wrapper extends Contain
  * Remove a listener no longer interested in InstanceEvents.
  *
  * @param listener The listener to remove
+ *
+ * @deprecated Will be removed in 9.0.x onwards
  */
+@Deprecated
 public void removeInstanceListener(InstanceListener listener);
 
 

Modified: 

svn commit: r1722948 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/storeconfig/ java/org/apache/catalina/util/ webapps/docs/

[markt]

Author: markt
Date: Mon Jan  4 19:41:20 2016
New Revision: 1722948

URL: http://svn.apache.org/viewvc?rev=1722948=rev
Log:
Deprecate InstanceListener, InstanceEvent and InstanceSupport prior to removal 
in 9.0.x

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/InstanceEvent.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/InstanceListener.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/Wrapper.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/InstanceListenerSF.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/InstanceSupport.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  4 19:41:20 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1
 

svn commit: r1722801 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/RestrictedServlets.properties webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Jan  4 08:54:28 2016
New Revision: 1722801

URL: http://svn.apache.org/viewvc?rev=1722801=rev
Log:
Add the StatusManagerServlet to the list of Servlets that can only be loaded by 
privileged applications.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/RestrictedServlets.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  4 08:54:28 2016
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527
-/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: r1722802 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/RestrictedServlets.properties webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Jan  4 08:56:04 2016
New Revision: 1722802

URL: http://svn.apache.org/viewvc?rev=1722802=rev
Log:
Add the StatusManagerServlet to the list of Servlets that can only be loaded by 
privileged applications.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/RestrictedServlets.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  4 08:56:04 2016
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989,1668541
 
,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 

svn commit: r1722824 - in /tomcat/trunk/java/org/apache/catalina/session: FileStore.java JDBCStore.java StandardManager.java StandardSessionFacade.java

[markt]

Author: markt
Date: Mon Jan  4 10:16:11 2016
New Revision: 1722824

URL: http://svn.apache.org/viewvc?rev=1722824=rev
Log:
Code clean-up and Javadoc fixes

Modified:
tomcat/trunk/java/org/apache/catalina/session/FileStore.java
tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java

Modified: tomcat/trunk/java/org/apache/catalina/session/FileStore.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/FileStore.java?rev=1722824=1722823=1722824=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/FileStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/FileStore.java Mon Jan  4 
10:16:11 2016
@@ -14,11 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.session;
 
-
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -37,7 +34,6 @@ import org.apache.catalina.Loader;
 import org.apache.catalina.Session;
 import org.apache.catalina.util.CustomObjectInputStream;
 
-
 /**
  * Concrete implementation of the Store interface that utilizes
  * a file per saved Session in a configured directory.  Sessions that are
@@ -47,10 +43,8 @@ import org.apache.catalina.util.CustomOb
  */
 public final class FileStore extends StoreBase {
 
-
 // - Constants
 
-
 /**
  * The extension to use for serialized session filenames.
  */
@@ -59,7 +53,6 @@ public final class FileStore extends Sto
 
 // - Instance Variables
 
-
 /**
  * The pathname of the directory in which Sessions are stored.
  * This may be an absolute pathname, or a relative path that is
@@ -88,14 +81,11 @@ public final class FileStore extends Sto
 
 // - Properties
 
-
 /**
- * Return the directory path for this Store.
+ * @return The directory path for this Store.
  */
 public String getDirectory() {
-
-return (directory);
-
+return directory;
 }
 
 
@@ -105,21 +95,18 @@ public final class FileStore extends Sto
  * @param path The new directory path
  */
 public void setDirectory(String path) {
-
 String oldDirectory = this.directory;
 this.directory = path;
 this.directoryFile = null;
-support.firePropertyChange("directory", oldDirectory,
-   this.directory);
-
+support.firePropertyChange("directory", oldDirectory, this.directory);
 }
 
 
 /**
- * Return the thread name for this Store.
+ * @return The thread name for this Store.
  */
 public String getThreadName() {
-return(threadName);
+return threadName;
 }
 
 
@@ -128,7 +115,7 @@ public final class FileStore extends Sto
  */
 @Override
 public String getStoreName() {
-return(storeName);
+return storeName;
 }
 
 
@@ -139,7 +126,6 @@ public final class FileStore extends Sto
  */
 @Override
 public int getSize() throws IOException {
-
 // Acquire the list of files in our storage directory
 File file = directory();
 if (file == null) {
@@ -157,27 +143,22 @@ public final class FileStore extends Sto
 }
 }
 return keycount;
-
 }
 
 
 // - Public Methods
 
-
 /**
  * Remove all of the Sessions in this Store.
  *
  * @exception IOException if an input/output error occurs
  */
 @Override
-public void clear()
-throws IOException {
-
+public void clear() throws IOException {
 String[] keys = keys();
 for (int i = 0; i < keys.length; i++) {
 remove(keys[i]);
 }
-
 }
 
 
@@ -190,7 +171,6 @@ public final class FileStore extends Sto
  */
 @Override
 public String[] keys() throws IOException {
-
 // Acquire the list of files in our storage directory
 File file = directory();
 if (file == null) {
@@ -213,7 +193,6 @@ public final class FileStore extends Sto
 }
 }
 return list.toArray(new String[list.size()]);
-
 }
 
 
@@ -228,9 +207,7 @@ public final class FileStore extends Sto
  * @exception IOException if an input/output error occurs
  */
 @Override
-public Session load(String id)
-throws ClassNotFoundException, IOException {
-
+public Session load(String id) throws ClassNotFoundException, IOException {
 // Open an input stream to the specified pathname, if any
 File file = file(id);
   

svn commit: r1722831 - in /tomcat/trunk/java/org/apache/catalina/session: FileStore.java JDBCStore.java StandardManager.java

[markt]

Author: markt
Date: Mon Jan  4 10:31:54 2016
New Revision: 1722831

URL: http://svn.apache.org/viewvc?rev=1722831=rev
Log:
Refactor to always use the CustomObjectInputStream

Modified:
tomcat/trunk/java/org/apache/catalina/session/FileStore.java
tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java

Modified: tomcat/trunk/java/org/apache/catalina/session/FileStore.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/FileStore.java?rev=1722831=1722830=1722831=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/FileStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/FileStore.java Mon Jan  4 
10:31:54 2016
@@ -235,12 +235,12 @@ public final class FileStore extends Sto
 if (loader != null) {
 classLoader = loader.getClassLoader();
 }
-if (classLoader != null) {
-Thread.currentThread().setContextClassLoader(classLoader);
-ois = new CustomObjectInputStream(bis, classLoader);
+if (classLoader == null) {
+classLoader = getClass().getClassLoader();
 } else {
-ois = new ObjectInputStream(bis);
+Thread.currentThread().setContextClassLoader(classLoader);
 }
+ois = new CustomObjectInputStream(bis, classLoader);
 
 StandardSession session = (StandardSession) 
manager.createEmptySession();
 session.readObjectData(ois);

Modified: tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java?rev=1722831=1722830=1722831=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java Mon Jan  4 
10:31:54 2016
@@ -627,13 +627,12 @@ public class JDBCStore extends StoreBase
 if (loader != null) {
 classLoader = loader.getClassLoader();
 }
-if (classLoader != null) {
-
Thread.currentThread().setContextClassLoader(classLoader);
-ois = new CustomObjectInputStream(bis,
-classLoader);
+if (classLoader == null) {
+classLoader = getClass().getClassLoader();
 } else {
-ois = new ObjectInputStream(bis);
+
Thread.currentThread().setContextClassLoader(classLoader);
 }
+ois = new CustomObjectInputStream(bis, 
classLoader);
 
 if 
(manager.getContext().getLogger().isDebugEnabled()) {
 
manager.getContext().getLogger().debug(sm.getString(getStoreName() + ".loading",

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1722831=1722830=1722831=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Mon Jan  
4 10:31:54 2016
@@ -216,17 +216,10 @@ public class StandardManager extends Man
 if (loader != null) {
 classLoader = loader.getClassLoader();
 }
-if (classLoader != null) {
-if (log.isDebugEnabled()) {
-log.debug("Creating custom object input stream for class 
loader ");
-}
-ois = new CustomObjectInputStream(bis, classLoader);
-} else {
-if (log.isDebugEnabled()) {
-log.debug("Creating standard object input stream");
-}
-ois = new ObjectInputStream(bis);
+if (classLoader == null) {
+classLoader = getClass().getClassLoader();
 }
+ois = new CustomObjectInputStream(bis, classLoader);
 } catch (FileNotFoundException e) {
 if (log.isDebugEnabled()) {
 log.debug("No persisted data file found");



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722828 - /tomcat/trunk/java/org/apache/catalina/session/FileStore.java

[markt]

Author: markt
Date: Mon Jan  4 10:23:16 2016
New Revision: 1722828

URL: http://svn.apache.org/viewvc?rev=1722828=rev
Log:
Clean-up

Modified:
tomcat/trunk/java/org/apache/catalina/session/FileStore.java

Modified: tomcat/trunk/java/org/apache/catalina/session/FileStore.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/FileStore.java?rev=1722828=1722827=1722828=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/FileStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/FileStore.java Mon Jan  4 
10:23:16 2016
@@ -211,11 +211,11 @@ public final class FileStore extends Sto
 // Open an input stream to the specified pathname, if any
 File file = file(id);
 if (file == null) {
-return (null);
+return null;
 }
 
-if (! file.exists()) {
-return (null);
+if (!file.exists()) {
+return null;
 }
 if (manager.getContext().getLogger().isDebugEnabled()) {
 
manager.getContext().getLogger().debug(sm.getString(getStoreName()+".loading",
@@ -246,7 +246,7 @@ public final class FileStore extends Sto
 (StandardSession) manager.createEmptySession();
 session.readObjectData(ois);
 session.setManager(manager);
-return (session);
+return session;
 } catch (FileNotFoundException e) {
 if (manager.getContext().getLogger().isDebugEnabled()) {
 manager.getContext().getLogger().debug("No persisted data file 
found");



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722829 - /tomcat/trunk/java/org/apache/catalina/session/FileStore.java

[markt]

Author: markt
Date: Mon Jan  4 10:27:08 2016
New Revision: 1722829

URL: http://svn.apache.org/viewvc?rev=1722829=rev
Log:
Clean-up

Modified:
tomcat/trunk/java/org/apache/catalina/session/FileStore.java

Modified: tomcat/trunk/java/org/apache/catalina/session/FileStore.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/FileStore.java?rev=1722829=1722828=1722829=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/FileStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/FileStore.java Mon Jan  4 
10:27:08 2016
@@ -242,8 +242,7 @@ public final class FileStore extends Sto
 ois = new ObjectInputStream(bis);
 }
 
-StandardSession session =
-(StandardSession) manager.createEmptySession();
+StandardSession session = (StandardSession) 
manager.createEmptySession();
 session.readObjectData(ois);
 session.setManager(manager);
 return session;



-
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-7-trunk

[buildbot]

The Buildbot has detected a build exception on builder tomcat-7-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-7-trunk/builds/278

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] 1722801
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: r1722800 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/RestrictedServlets.properties webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Jan  4 08:53:33 2016
New Revision: 1722800

URL: http://svn.apache.org/viewvc?rev=1722800=rev
Log:
Add the StatusManagerServlet to the list of Servlets that can only be loaded by 
privileged applications.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/RestrictedServlets.properties
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  4 08:53:33 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1
 
666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555
 

svn commit: r1722808 - /tomcat/trunk/TOMCAT-NEXT.txt

[markt]

Author: markt
Date: Mon Jan  4 09:07:44 2016
New Revision: 1722808

URL: http://svn.apache.org/viewvc?rev=1722808=rev
Log:
Slow progress

Modified:
tomcat/trunk/TOMCAT-NEXT.txt

Modified: tomcat/trunk/TOMCAT-NEXT.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1722808=1722807=1722808=diff
==
--- tomcat/trunk/TOMCAT-NEXT.txt (original)
+++ tomcat/trunk/TOMCAT-NEXT.txt Mon Jan  4 09:07:44 2016
@@ -17,7 +17,7 @@
 
 Notes of things to consider for the next major Tomcat release (9.0.x)
 
- 1. Fix Java 8 Javadoc warnings. Currently ~2400.
+ 1. Fix Java 8 Javadoc warnings. Currently ~2300.
 
  2. DONE.
 Remove BIO AJP and HTTP connector.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722807 - /tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java

[markt]

Author: markt
Date: Mon Jan  4 09:07:09 2016
New Revision: 1722807

URL: http://svn.apache.org/viewvc?rev=1722807=rev
Log:
Javadoc fixes

Modified:
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java

Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1722807=1722806=1722807=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Mon Jan  4 
09:07:09 2016
@@ -228,7 +228,8 @@ public abstract class ManagerBase extend
 }
 
 
-/** Returns the name of the implementation class.
+/**
+ * @return The name of the implementation class.
  */
 public String getClassName() {
 return this.getClass().getName();
@@ -331,7 +332,7 @@ public abstract class ManagerBase extend
 
 
 /**
- * Return the descriptive short name of this Manager implementation.
+ * @return The descriptive short name of this Manager implementation.
  */
 public String getName() {
 
@@ -340,7 +341,7 @@ public abstract class ManagerBase extend
 }
 
 /**
- * Return the secure random number generator class name.
+ * @return The secure random number generator class name.
  */
 public String getSecureRandomClass() {
 
@@ -366,7 +367,7 @@ public abstract class ManagerBase extend
 
 
 /**
- * Return the secure random number generator algorithm name.
+ * @return The secure random number generator algorithm name.
  */
 public String getSecureRandomAlgorithm() {
 return secureRandomAlgorithm;
@@ -385,7 +386,7 @@ public abstract class ManagerBase extend
 
 
 /**
- * Return the secure random number generator provider name.
+ * @return The secure random number generator provider name.
  */
 public String getSecureRandomProvider() {
 return secureRandomProvider;
@@ -444,7 +445,7 @@ public abstract class ManagerBase extend
 }
 
 /**
- * Return the frequency of manager checks.
+ * @return The frequency of manager checks.
  */
 public int getProcessExpiresFrequency() {
 
@@ -902,8 +903,8 @@ public abstract class ManagerBase extend
 
 
 /**
- * Return the maximum number of active Sessions allowed, or -1 for
- * no limit.
+ * @return The maximum number of active Sessions allowed, or -1 for no
+ * limit.
  */
 public int getMaxActiveSessions() {
 
@@ -1098,11 +1099,12 @@ public abstract class ManagerBase extend
 
 
 /**
- * For debugging: return a list of all session ids currently active
+ * For debugging.
  *
+ * @return A space separated list of all session IDs currently active
  */
 public String listSessionIds() {
-StringBuilder sb=new StringBuilder();
+StringBuilder sb = new StringBuilder();
 Iterator keys = sessions.keySet().iterator();
 while (keys.hasNext()) {
 sb.append(keys.next()).append(" ");
@@ -1112,11 +1114,13 @@ public abstract class ManagerBase extend
 
 
 /**
- * For debugging: get a session attribute
+ * For debugging.
+ *
+ * @param sessionId The ID for the session of interest
+ * @param key   The key for the attribute to obtain
  *
- * @param sessionId
- * @param key
- * @return The attribute value, if found, null otherwise
+ * @return The attribute value for the specified session, if found, null
+ * otherwise
  */
 public String getSessionAttribute( String sessionId, String key ) {
 Session s = sessions.get(sessionId);
@@ -1309,15 +1313,16 @@ public abstract class ManagerBase extend
 }
 
 /**
- * Time stamp associated with this piece of timing information in
- * milliseconds.
+ * @return Time stamp associated with this piece of timing information
+ * in milliseconds.
  */
 public long getTimestamp() {
 return timestamp;
 }
 
 /**
- * Duration associated with this piece of timing information in 
seconds.
+ * @return Duration associated with this piece of timing information in
+ * seconds.
  */
 public int getDuration() {
 return duration;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722799 - in /tomcat/trunk: java/org/apache/catalina/core/RestrictedServlets.properties webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Jan  4 08:51:47 2016
New Revision: 1722799

URL: http://svn.apache.org/viewvc?rev=1722799=rev
Log:
Add the StatusManagerServlet to the list of Servlets that can only be loaded by 
privileged applications.

Modified:
tomcat/trunk/java/org/apache/catalina/core/RestrictedServlets.properties
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/core/RestrictedServlets.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/RestrictedServlets.properties?rev=1722799=1722798=1722799=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/RestrictedServlets.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/RestrictedServlets.properties 
Mon Jan  4 08:51:47 2016
@@ -16,3 +16,4 @@
 org.apache.catalina.ssi.SSIServlet=restricted
 org.apache.catalina.servlets.CGIServlet=restricted
 org.apache.catalina.manager.JMXProxyServlet=restricted
+org.apache.catalina.manager.StatusManagerServlet=restricted

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1722799=1722798=1722799=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan  4 08:51:47 2016
@@ -155,6 +155,10 @@
 header to the HttpHeaderSecurityFilter. Patch provided by
 Jacopo Cappellato. (markt)
   
+  
+Add the StatusManagerServlet to the list of Servlets that
+can only be loaded by privileged applications. (markt)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722975 - /tomcat/trunk/webapps/docs/config/http.xml

[markt]

Author: markt
Date: Mon Jan  4 22:54:48 2016
New Revision: 1722975

URL: http://svn.apache.org/viewvc?rev=1722975=rev
Log:
ciphers attribute. Fix typo. Update default.

Modified:
tomcat/trunk/webapps/docs/config/http.xml

Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1722975=1722974=1722975=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Mon Jan  4 22:54:48 2016
@@ -1076,7 +1076,7 @@
 
   The ciphers to enable using the OpenSSL syntax. (See the OpenSSL
   documentation for the list of ciphers supported and the syntax).
-  Alternatively, a comma separated list of ciphers using with the standard
+  Alternatively, a comma separated list of ciphers using the standard
   OpenSSL cipher names or the standard JSSE cipher names may be used.
   When converting from OpenSSL syntax to JSSE ciphers for JSSE based
   connectors, the behaviour of the OpenSSL syntax parsing is kept aligned
@@ -1084,7 +1084,8 @@
   Only the ciphers that are supported by the SSL implementation will be
   used.
   If not specified, a default (using the OpenSSL notation) of
-  HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5 will be used.
+  HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA will be 
+  used.
   Note that, by default, the order in which ciphers are defined is
   treated as an order of preference. See honorCipherOrder.
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722984 - in /tomcat/trunk/java/org/apache/tomcat/util/net: SSLHostConfig.java openssl/ciphers/OpenSSLCipherConfigurationParser.java

[markt]

Author: markt
Date: Mon Jan  4 23:18:17 2016
New Revision: 1722984

URL: http://svn.apache.org/viewvc?rev=1722984=rev
Log:
Javadoc improvements

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1722984=1722983=1722984=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Mon Jan  4 
23:18:17 2016
@@ -244,6 +244,12 @@ public class SSLHostConfig {
 }
 
 
+/**
+ * Set the new cipher configuration. Note: Regardless of the format used to
+ * set the configuration, it is always stored in OpenSSL format.
+ *
+ * @param ciphersList The new cipher configuration in OpenSSL or JSSE 
format
+ */
 public void setCiphers(String ciphersList) {
 // Ciphers is stored in OpenSSL format. Convert the provided value if
 // necessary.
@@ -272,10 +278,12 @@ public class SSLHostConfig {
 }
 this.cipherList = null;
 this.jsseCipherNames = null;
-
 }
 
 
+/**
+ * @return An OpenSSL cipher string for the current configuration.
+ */
 public String getCiphers() {
 return ciphers;
 }
@@ -289,6 +297,13 @@ public class SSLHostConfig {
 }
 
 
+/**
+ * Obtain the list of JSSE cipher names for the current configuration.
+ * Ciphers included in the configuration but not supported by JSSE will be
+ * excluded from this list.
+ *
+ * @return A list of the JSSE cipher names
+ */
 public List getJsseCipherNames() {
 if (jsseCipherNames == null) {
 jsseCipherNames = 
OpenSSLCipherConfigurationParser.convertForJSSE(getCipherList());

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java?rev=1722984=1722983=1722984=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
 Mon Jan  4 23:18:17 2016
@@ -704,7 +704,8 @@ public class OpenSSLCipherConfigurationP
 }
 
 /**
- * Parse the specified expression according to the OpenSSL syntax and 
returns a list of standard cipher names.
+ * Parse the specified expression according to the OpenSSL syntax and
+ * returns a list of standard JSSE cipher names.
  *
  * @param expression the openssl expression to define a list of cipher.
  * @return the corresponding list of ciphers.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722997 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/modeler/NotificationInfo.java java/org/apache/tomcat/util/modeler/OperationInfo.java

[kkolinko]

Author: kkolinko
Date: Tue Jan  5 03:25:44 2016
New Revision: 1722997

URL: http://svn.apache.org/viewvc?rev=1722997=rev
Log:
Mark ReadWriteLock in modeler classes as final. (In review of 
r1722660/r1722661/r1722663 of Tomcat 7).

The lock itself is accessed by multiple threads, thus it is better to mark such 
field as final to ensure consistency.
Merged r1722996 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan  5 03:25:44 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1
 
666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555
 

svn commit: r1722998 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/modeler/ManagedBean.java java/org/apache/tomcat/util/modeler/NotificationInfo.java java/org/apache/tomcat/util/modeler/O

[kkolinko]

Author: kkolinko
Date: Tue Jan  5 03:31:52 2016
New Revision: 1722998

URL: http://svn.apache.org/viewvc?rev=1722998=rev
Log:
Mark ReadWriteLock in modeler classes as final. (In review of 
r1722660/r1722661/r1722663 of Tomcat 7).

The lock itself is accessed by multiple threads, thus it is better to mark such 
field as final to ensure consistency.
Merged r1722997 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan  5 03:31:52 2016
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941
-/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
 

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc7.0.x-test-nio has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test-nio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 47 mins 37 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-NIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160104.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/w
 
orkspace/apache-commons/daemon/dist/bin/commons-daemon-20160104-native-src.tar.gz
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160104-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dexecute.test.nio=true -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160104.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build

svn commit: r1722996 - in /tomcat/trunk/java/org/apache/tomcat/util/modeler: NotificationInfo.java OperationInfo.java

[kkolinko]

Author: kkolinko
Date: Tue Jan  5 03:17:36 2016
New Revision: 1722996

URL: http://svn.apache.org/viewvc?rev=1722996=rev
Log:
Mark ReadWriteLock in modeler classes as final. (In review of 
r1722660/r1722661/r1722663 of Tomcat 7).

The lock itself is accessed by multiple threads, thus it is better to mark such 
field as final to ensure consistency.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java?rev=1722996=1722995=1722996=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java Tue 
Jan  5 03:17:36 2016
@@ -41,7 +41,7 @@ public class NotificationInfo extends Fe
  */
 transient MBeanNotificationInfo info = null;
 protected String notifTypes[] = new String[0];
-protected ReadWriteLock notifTypesLock = new ReentrantReadWriteLock();
+protected final ReadWriteLock notifTypesLock = new 
ReentrantReadWriteLock();
 
 // - Properties
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java?rev=1722996=1722995=1722996=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java Tue Jan 
 5 03:17:36 2016
@@ -48,7 +48,7 @@ public class OperationInfo extends Featu
 
 protected String impact = "UNKNOWN";
 protected String role = "operation";
-protected ReadWriteLock parametersLock = new ReentrantReadWriteLock();
+protected final ReadWriteLock parametersLock = new 
ReentrantReadWriteLock();
 protected ParameterInfo parameters[] = new ParameterInfo[0];
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot success in ASF Buildbot on tomcat-8-trunk

[buildbot]

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/385

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] 1722997
Blamelist: kkolinko

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722859 - /tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java

[markt]

Author: markt
Date: Mon Jan  4 12:37:32 2016
New Revision: 1722859

URL: http://svn.apache.org/viewvc?rev=1722859=rev
Log:
Clean-up

Modified:
tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java

Modified: 
tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java?rev=1722859=1722858=1722859=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java Mon 
Jan  4 12:37:32 2016
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.catalina.util;
 
 import java.io.IOException;
@@ -31,9 +30,7 @@ import java.lang.reflect.Proxy;
  * @author Craig R. McClanahan
  * @author Bip Thelin
  */
-public final class CustomObjectInputStream
-extends ObjectInputStream {
-
+public final class CustomObjectInputStream extends ObjectInputStream {
 
 /**
  * The class loader we will use to resolve classes.
@@ -49,10 +46,7 @@ public final class CustomObjectInputStre
  *
  * @exception IOException if an input/output error occurs
  */
-public CustomObjectInputStream(InputStream stream,
-   ClassLoader classLoader)
-throws IOException {
-
+public CustomObjectInputStream(InputStream stream, ClassLoader 
classLoader) throws IOException {
 super(stream);
 this.classLoader = classLoader;
 }
@@ -92,11 +86,12 @@ public final class CustomObjectInputStre
  */
 @Override
 protected Class resolveProxyClass(String[] interfaces)
-throws IOException, ClassNotFoundException {
+throws IOException, ClassNotFoundException {
 
 Class[] cinterfaces = new Class[interfaces.length];
-for (int i = 0; i < interfaces.length; i++)
+for (int i = 0; i < interfaces.length; i++) {
 cinterfaces[i] = classLoader.loadClass(interfaces[i]);
+}
 
 try {
 return Proxy.getProxyClass(classLoader, cinterfaces);
@@ -104,5 +99,4 @@ public final class CustomObjectInputStre
 throw new ClassNotFoundException(null, e);
 }
 }
-
 }



-
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-nio (in module tomcat-8.0.x) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc8.0.x-test-nio has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-nio :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 59 mins 25 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160104-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160104.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160104-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-1.0.2/dest-20160104/bin/op
 enssl -Dexecute.test.bio=false -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat

Re: svn commit: r1722996 - in /tomcat/trunk/java/org/apache/tomcat/util/modeler: NotificationInfo.java OperationInfo.java

[Violeta Georgieva]

2016-01-05 5:17 GMT+02:00 :
>
> Author: kkolinko
> Date: Tue Jan  5 03:17:36 2016
> New Revision: 1722996
>
> URL: http://svn.apache.org/viewvc?rev=1722996=rev
> Log:
> Mark ReadWriteLock in modeler classes as final. (In review of
r1722660/r1722661/r1722663 of Tomcat 7).
>
> The lock itself is accessed by multiple threads, thus it is better to
mark such field as final to ensure consistency.
>

Thanks for the review
Violeta

> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
> tomcat/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java
>
> Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
> URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java?rev=1722996=1722995=1722996=diff
>
==
> ---
tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
(original)
> +++
tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java Tue
Jan  5 03:17:36 2016
> @@ -41,7 +41,7 @@ public class NotificationInfo extends Fe
>   */
>  transient MBeanNotificationInfo info = null;
>  protected String notifTypes[] = new String[0];
> -protected ReadWriteLock notifTypesLock = new
ReentrantReadWriteLock();
> +protected final ReadWriteLock notifTypesLock = new
ReentrantReadWriteLock();
>
>  // -
Properties
>
>
> Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java
> URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java?rev=1722996=1722995=1722996=diff
>
==
> --- tomcat/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java
(original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java
Tue Jan  5 03:17:36 2016
> @@ -48,7 +48,7 @@ public class OperationInfo extends Featu
>
>  protected String impact = "UNKNOWN";
>  protected String role = "operation";
> -protected ReadWriteLock parametersLock = new
ReentrantReadWriteLock();
> +protected final ReadWriteLock parametersLock = new
ReentrantReadWriteLock();
>  protected ParameterInfo parameters[] = new ParameterInfo[0];
>
>
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

Re: Upcoming release plans

[Violeta Georgieva]

2016-01-05 0:46 GMT+02:00 Mark Thomas :
>
> The changelog for 9.0.x is getting quite long so I'd like to do a
> release. A 8.0.x release wouldn't hurt either.
>
> I recall that Remy said it would be useful to have a Tomcat-Native
> release first before the next 9.0.x release so my current thinking is:
>
> - tag Tomcat-Native 1.2.4 tomorrow and start the release process
> - tidy up any remaining 9.0.x and 8.0.x issues while the 1.2.4 vote
>   progresses
> - update 9.0.x and 8.0.x to Tomcat-Native 1.2.4 once released
> - tag 9.0.x and start the release process
> - tag 8.0.x and start the release process
>

I can prepare 7.0.x for release once 8/9 are released.

Regards,
Violeta

> Depending on timing the last two items may be in parallel or series.
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

svn commit: r1722883 - /tomcat/trunk/java/org/apache/catalina/session/StandardManager.java

[kkolinko]

Author: kkolinko
Date: Mon Jan  4 14:42:12 2016
New Revision: 1722883

URL: http://svn.apache.org/viewvc?rev=1722883=rev
Log:
Simplify: no need for initial value - all code paths create a 
CustomObjectInputStream. (review of r1722831)

Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1722883=1722882=1722883=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Mon Jan  
4 14:42:12 2016
@@ -203,7 +203,7 @@ public class StandardManager extends Man
 }
 FileInputStream fis = null;
 BufferedInputStream bis = null;
-ObjectInputStream ois = null;
+ObjectInputStream ois;
 Loader loader = null;
 ClassLoader classLoader = null;
 try {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722902 - in /tomcat/trunk/java/org/apache/catalina/core: DefaultInstanceManager.java LocalStrings.properties

[kkolinko]

Author: kkolinko
Date: Mon Jan  4 15:49:58 2016
New Revision: 1722902

URL: http://svn.apache.org/viewvc?rev=1722902=rev
Log:
Fix messed-up message resources in DefaultInstanceManager.

Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1722902=1722901=1722902=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Mon 
Jan  4 15:49:58 2016
@@ -95,11 +95,11 @@ public class DefaultInstanceManager impl
 catalinaContext.getLogger());
 restrictedListeners = loadProperties(
 "org/apache/catalina/core/RestrictedListeners.properties",
-"defaultInstanceManager.restrictedListenersResources",
+
sm.getString("defaultInstanceManager.restrictedListenersResources"),
 catalinaContext.getLogger());
 restrictedFilters = loadProperties(
 "org/apache/catalina/core/RestrictedFilters.properties",
-"defaultInstanceManager.restrictedFiltersResource",
+
sm.getString("defaultInstanceManager.restrictedFiltersResource"),
 catalinaContext.getLogger());
 this.context = context;
 this.injectionMap = injectionMap;

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1722902=1722901=1722902=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Mon Jan  
4 15:49:58 2016
@@ -88,7 +88,6 @@ containerBase.backgroundProcess.cluster=
 containerBase.backgroundProcess.realm=Exception processing realm {0} 
background process
 containerBase.backgroundProcess.valve=Exception processing valve {0} 
background process
 containerBase.backgroundProcess.unexpectedThreadDeath=Unexpected death of 
background thread {0}
-defaultInstanceManager.invalidInjection=Invalid method resource injection 
annotation
 filterChain.filter=Filter execution threw an exception
 filterChain.servlet=Servlet execution threw an exception
 jreLeakListener.gcDaemonFail=Failed to trigger creation of the GC Daemon 
thread during Tomcat start to prevent possible memory leaks. This is expected 
on non-Sun JVMs.
@@ -222,6 +221,7 @@ standardWrapper.waiting=Waiting for {0}
 threadLocalLeakPreventionListener.lifecycleEvent.error=Exception processing 
lifecycle event {0}
 threadLocalLeakPreventionListener.containerEvent.error=Exception processing 
container event {0}
 
+defaultInstanceManager.invalidInjection=Invalid method resource injection 
annotation
 defaultInstanceManager.restrictedServletsResource=Restricted servlets property 
file not found
-defaultInstanceManager.restrictedFiltersResource=Restricted filters property 
file not founddefaultInstanceManager.privilegedFilter=Filter of class {0} is 
privileged and cannot be loaded by this web application
-defaultInstanceManager.restrictedListenersResources="Restricted listeners 
property file not found
+defaultInstanceManager.restrictedFiltersResource=Restricted filters property 
file not found
+defaultInstanceManager.restrictedListenersResources=Restricted listeners 
property file not found



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722905 - in /tomcat/trunk/java/org/apache/catalina/core: DefaultInstanceManager.java LocalStrings.properties

[kkolinko]

Author: kkolinko
Date: Mon Jan  4 16:00:49 2016
New Revision: 1722905

URL: http://svn.apache.org/viewvc?rev=1722905=rev
Log:
Simplify. Fix naming of message keys (s/Resources/Resource/). Log name of a 
missing resource.

Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1722905=1722904=1722905=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Mon 
Jan  4 16:00:49 2016
@@ -88,19 +88,16 @@ public class DefaultInstanceManager impl
 privileged = catalinaContext.getPrivileged();
 this.containerClassLoader = containerClassLoader;
 ignoreAnnotations = catalinaContext.getIgnoreAnnotations();
-StringManager sm = StringManager.getManager(Constants.Package);
+Log log = catalinaContext.getLogger();
 restrictedServlets = loadProperties(
 "org/apache/catalina/core/RestrictedServlets.properties",
-
sm.getString("defaultInstanceManager.restrictedServletsResource"),
-catalinaContext.getLogger());
+"defaultInstanceManager.restrictedServletsResource", log);
 restrictedListeners = loadProperties(
 "org/apache/catalina/core/RestrictedListeners.properties",
-
sm.getString("defaultInstanceManager.restrictedListenersResources"),
-catalinaContext.getLogger());
+"defaultInstanceManager.restrictedListenersResource", log);
 restrictedFilters = loadProperties(
 "org/apache/catalina/core/RestrictedFilters.properties",
-
sm.getString("defaultInstanceManager.restrictedFiltersResource"),
-catalinaContext.getLogger());
+"defaultInstanceManager.restrictedFiltersResource", log);
 this.context = context;
 this.injectionMap = injectionMap;
 this.postConstructMethods = catalinaContext.findPostConstructMethods();
@@ -624,17 +621,17 @@ public class DefaultInstanceManager impl
 }
 }
 
-private static Properties loadProperties(String resourceName, String 
errorString, Log log) {
+private static Properties loadProperties(String resourceName, String 
messageKey, Log log) {
 Properties result = new Properties();
 ClassLoader cl = DefaultInstanceManager.class.getClassLoader();
 try (InputStream is = cl.getResourceAsStream(resourceName)) {
-if (is ==null) {
-log.error(errorString);
+if (is == null) {
+log.error(sm.getString(messageKey, resourceName));
 } else {
 result.load(is);
 }
 } catch (IOException ioe) {
-log.error(errorString, ioe);
+log.error(sm.getString(messageKey, resourceName), ioe);
 }
 return result;
 }

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1722905=1722904=1722905=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Mon Jan  
4 16:00:49 2016
@@ -222,6 +222,6 @@ threadLocalLeakPreventionListener.lifecy
 threadLocalLeakPreventionListener.containerEvent.error=Exception processing 
container event {0}
 
 defaultInstanceManager.invalidInjection=Invalid method resource injection 
annotation
-defaultInstanceManager.restrictedServletsResource=Restricted servlets property 
file not found
-defaultInstanceManager.restrictedFiltersResource=Restricted filters property 
file not found
-defaultInstanceManager.restrictedListenersResources=Restricted listeners 
property file not found
+defaultInstanceManager.restrictedFiltersResource=Restricted filters property 
file not found [{0}]
+defaultInstanceManager.restrictedListenersResource=Restricted listeners 
property file not found [{0}]
+defaultInstanceManager.restrictedServletsResource=Restricted servlets property 
file not found [{0}]



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/838

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] 1722905
Blamelist: kkolinko

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722912 - in /tomcat/trunk/java/org/apache/catalina/core: ApplicationFilterConfig.java ApplicationFilterFactory.java ApplicationHttpRequest.java

[markt]

Author: markt
Date: Mon Jan  4 16:22:56 2016
New Revision: 1722912

URL: http://svn.apache.org/viewvc?rev=1722912=rev
Log:
Javadoc

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1722912=1722911=1722912=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Mon 
Jan  4 16:22:56 2016
@@ -153,7 +153,7 @@ public final class ApplicationFilterConf
 }
 
 /**
- * Return the class of the filter we are configuring.
+ * @return The class of the filter we are configuring.
  */
 public String getFilterClass() {
 return filterDef.getFilterClass();

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java?rev=1722912=1722911=1722912=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java 
Mon Jan  4 16:22:56 2016
@@ -40,13 +40,15 @@ public final class ApplicationFilterFact
 
 
 /**
- * Construct and return a FilterChain implementation that will wrap the
- * execution of the specified servlet instance.  If we should not execute
- * a filter chain at all, return null.
+ * Construct a FilterChain implementation that will wrap the execution of
+ * the specified servlet instance.
  *
  * @param request The servlet request we are processing
+ * @param wrapper The wrapper managing the servlet instance
  * @param servlet The servlet instance to be wrapped
-
+ *
+ * @return The configured FilterChain instance or null if none is to be
+ * executed.
  */
 public static ApplicationFilterChain createFilterChain
 (ServletRequest request, Wrapper wrapper, Servlet servlet) {
@@ -67,7 +69,7 @@ public final class ApplicationFilterFact
 
 // If there is no servlet to execute, return null
 if (servlet == null)
-return (null);
+return null;
 
 // Create and initialize a filter chain object
 ApplicationFilterChain filterChain = null;

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1722912=1722911=1722912=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Mon 
Jan  4 16:22:56 2016
@@ -87,6 +87,9 @@ class ApplicationHttpRequest extends Htt
  * Construct a new wrapped request around the specified servlet request.
  *
  * @param request The servlet request being wrapped
+ * @param context The target context for the wrapped request
+ * @param crossContext {@code true} if the wrapped request will be a
+ * cross-context request, otherwise {@code false}
  */
 public ApplicationHttpRequest(HttpServletRequest request, Context context,
   boolean crossContext) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: InstanceListener, InstanceEvent: Unused?

[Rémy Maucherat]

2016-01-04 17:14 GMT+01:00 Mark Thomas :

> Given that the Tomcat code doesn't contain any classes that implement
> InstanceListener is looks to be unused internally. I'm wondering if
> anyone else is using it. If not, there is a chunk of code we could
> remove including a bunch of (admittedly simple/fast) calls made on every
> request.
>
> Could we deprecate this in 8.0.x and remove it in 9.0.x?
>
> Tomcat had these hooks for integration in enterprise environments (but it
wasn't done very well and was incomplete). I tried to improve that with
simpler hooks (the instance manager and the thread listener). OTOH, as was
said previously, this one is used to do RunAs most likely [it needs to set
the proper security context when the servlet is invoked], so since someone
from TomEE is there to comment, what's the plan to do this feature without
it ?

Rémy

Re: InstanceListener, InstanceEvent: Unused?

[Konstantin Kolinko]

2016-01-04 19:14 GMT+03:00 Mark Thomas :
> Given that the Tomcat code doesn't contain any classes that implement
> InstanceListener is looks to be unused internally. I'm wondering if
> anyone else is using it. If not, there is a chunk of code we could
> remove including a bunch of (admittedly simple/fast) calls made on every
> request.
>
> Could we deprecate this in 8.0.x and remove it in 9.0.x?


The same discussion from 5 years ago (2011-01-07):
http://tomcat.markmail.org/thread/fktuhl2ndeplpi6r
"[PROPOSAL] Remove o.a.catlina.InstanceListener"

Remy mentioned in that thread that JBoss class that I found
(public class RunAsListener implements InstanceListener)
is not relevant.
A random copy (google'd) is here,
http://stanford.edu/class/cs295/asgns/asgn6/src/org/jboss/web/tomcat/security/RunAsListener.java

I think that nowadays there are better ways to inject behaviour /
implement wrappers around init(), service() etc. - via AOP [1]. A
Servlet and Filter are interfaces. We have instrumentation support in
WebappClassLoader.

Maybe AOP needs some hooks in other places. A working example is
needed. But generally it would be better to use that rather than
support this costly callback interface with a pair of events for each
wrapped method.

In other words, an alternative to InstanceListener can be to provide a
hook that is called when a Filter / Servlet / Listener instance is
created / added to a web application and to allow to wrap that
instance. Implementation of that hook can create a proxy for the class
on the fly as needed.

Do we already have such a hook?
A hook that allows to wrap a servlet at creation time is InstanceManager.

I see no hook when adding a Servlet instance that is created by a web
application (via ServletContext.addServlet(String, String, Servlet)),
but in general one can implement a LifecycleListener and enumerate
wrappers after a web application have started. The servlet instance
can be obtained and replaced via
StandardWrapper.getServlet()/setServlet().


I am OK with removal of InstanceListener.

Best regards,
Konstantin Kolinko

[1] 
http://docs.spring.io/spring/docs/current/spring-framework-reference/html/aop.html

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1722923 - in /tomcat/trunk: java/org/apache/catalina/core/DefaultInstanceManager.java java/org/apache/catalina/core/LocalStrings.properties webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Mon Jan  4 17:31:16 2016
New Revision: 1722923

URL: http://svn.apache.org/viewvc?rev=1722923=rev
Log:
Simplify code and fix messages in 
org.apache.catalina.core.DefaultInstanceManager class.

Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1722923=1722922=1722923=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Mon 
Jan  4 17:31:16 2016
@@ -27,10 +27,13 @@ import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 import java.util.WeakHashMap;
 
 import javax.annotation.PostConstruct;
@@ -41,8 +44,6 @@ import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceUnit;
-import javax.servlet.Filter;
-import javax.servlet.Servlet;
 import javax.xml.ws.WebServiceRef;
 
 import org.apache.catalina.ContainerServlet;
@@ -72,9 +73,7 @@ public class DefaultInstanceManager impl
 protected final ClassLoader containerClassLoader;
 protected final boolean privileged;
 protected final boolean ignoreAnnotations;
-private final Properties restrictedFilters;
-private final Properties restrictedListeners;
-private final Properties restrictedServlets;
+private final Set restrictedClasses;
 private final Map annotationCache =
 new WeakHashMap<>();
 private final Map postConstructMethods;
@@ -89,15 +88,17 @@ public class DefaultInstanceManager impl
 this.containerClassLoader = containerClassLoader;
 ignoreAnnotations = catalinaContext.getIgnoreAnnotations();
 Log log = catalinaContext.getLogger();
-restrictedServlets = loadProperties(
+Set classNames = new HashSet<>();
+loadProperties(classNames,
 "org/apache/catalina/core/RestrictedServlets.properties",
 "defaultInstanceManager.restrictedServletsResource", log);
-restrictedListeners = loadProperties(
+loadProperties(classNames,
 "org/apache/catalina/core/RestrictedListeners.properties",
 "defaultInstanceManager.restrictedListenersResource", log);
-restrictedFilters = loadProperties(
+loadProperties(classNames,
 "org/apache/catalina/core/RestrictedFilters.properties",
 "defaultInstanceManager.restrictedFiltersResource", log);
+restrictedClasses = Collections.unmodifiableSet(classNames);
 this.context = context;
 this.injectionMap = injectionMap;
 this.postConstructMethods = catalinaContext.findPostConstructMethods();
@@ -521,27 +522,17 @@ public class DefaultInstanceManager impl
 if (privileged) {
 return;
 }
-if (Filter.class.isAssignableFrom(clazz)) {
-checkAccess(clazz, restrictedFilters);
-} else if (Servlet.class.isAssignableFrom(clazz)) {
-if (ContainerServlet.class.isAssignableFrom(clazz)) {
-throw new SecurityException("Restricted (ContainerServlet) " +
-clazz);
-}
-checkAccess(clazz, restrictedServlets);
-} else {
-checkAccess(clazz, restrictedListeners);
+if (ContainerServlet.class.isAssignableFrom(clazz)) {
+throw new SecurityException(sm.getString(
+"defaultInstanceManager.restrictedContainerServlet", 
clazz));
 }
-}
-
-private void checkAccess(Class clazz, Properties restricted) {
 while (clazz != null) {
-if ("restricted".equals(restricted.getProperty(clazz.getName( {
-throw new SecurityException("Restricted " + clazz);
+if (restrictedClasses.contains(clazz.getName())) {
+throw new SecurityException(sm.getString(
+"defaultInstanceManager.restrictedClass", clazz));
 }
 clazz = clazz.getSuperclass();
 }
-
 }
 
 /**
@@ -621,19 +612,31 @@ public class DefaultInstanceManager impl
 }
 }
 
-private static Properties loadProperties(String resourceName, String 
messageKey, Log log) {
-

Re: Upcoming release plans

[Rémy Maucherat]

2016-01-04 23:46 GMT+01:00 Mark Thomas :

> The changelog for 9.0.x is getting quite long so I'd like to do a
> release. A 8.0.x release wouldn't hurt either.
>
> I recall that Remy said it would be useful to have a Tomcat-Native
> release first before the next 9.0.x release so my current thinking is:
>

Yes, a change has been made to be able to detect the end of the handshake
during a renegotiation (this method also looks better during the initial
handshake but is incompatible with 1.2.3 - it will likely not detect the
handshake is done with the older native, so handshake will never complete).

>
> - tag Tomcat-Native 1.2.4 tomorrow and start the release process
> - tidy up any remaining 9.0.x and 8.0.x issues while the 1.2.4 vote
>   progresses
> - update 9.0.x and 8.0.x to Tomcat-Native 1.2.4 once released
>

Updating 8 to the new 1.2.4 native isn't mandatory.

- tag 9.0.x and start the release process
> - tag 8.0.x and start the release process
>
> Depending on timing the last two items may be in parallel or series.
>
> Rémy

svn commit: r1722926 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/DefaultInstanceManager.java java/org/apache/catalina/core/LocalStrings.properties webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Mon Jan  4 17:39:31 2016
New Revision: 1722926

URL: http://svn.apache.org/viewvc?rev=1722926=rev
Log:
Simplify code and fix messages in 
org.apache.catalina.core.DefaultInstanceManager class.

Merged r1722902, r1722905, r1722923 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  4 17:39:31 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1
 
666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555
 

Re: InstanceListener, InstanceEvent: Unused?

[Rémy Maucherat]

2016-01-04 17:14 GMT+01:00 Mark Thomas :

> Given that the Tomcat code doesn't contain any classes that implement
> InstanceListener is looks to be unused internally. I'm wondering if
> anyone else is using it. If not, there is a chunk of code we could
> remove including a bunch of (admittedly simple/fast) calls made on every
> request.
>
> Could we deprecate this in 8.0.x and remove it in 9.0.x?
>
> So about the proposal: +1 to try to remove InstanceListener, a more
specialized hook could be added instead if really needed.

Rémy

svn commit: r1722931 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/DefaultInstanceManager.java java/org/apache/catalina/core/LocalStrings.properties webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Mon Jan  4 17:51:58 2016
New Revision: 1722931

URL: http://svn.apache.org/viewvc?rev=1722931=rev
Log:
Simplify code and fix messages in 
org.apache.catalina.core.DefaultInstanceManager class.

Merged r1722926 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  4 17:51:58 2016
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800
-/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
 

[Bug 58751] Strange behaviour after calling sendError when an async request times out

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58751

Mark Thomas  changed:

   What|Removed |Added

 Resolution|INVALID |---
 Status|RESOLVED|REOPENED

--- Comment #4 from Mark Thomas  ---
The report suggested the test cases were variations of the same issue, not
different issues. Hence why the bug was closed when the first issue was found
to be invalid.

I've taken a closer look at the second issue and there is a problem with at
least 9.0.x and probably earlier versions as well.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/837

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] 1722902
Blamelist: kkolinko

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

InstanceListener, InstanceEvent: Unused?

[Mark Thomas]

Given that the Tomcat code doesn't contain any classes that implement
InstanceListener is looks to be unused internally. I'm wondering if
anyone else is using it. If not, there is a chunk of code we could
remove including a bunch of (admittedly simple/fast) calls made on every
request.

Could we deprecate this in 8.0.x and remove it in 9.0.x?

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: InstanceListener, InstanceEvent: Unused?

[Romain Manni-Bucau]

Hi

TomEE uses it but nothing justifying to keep the api - we can do it in
another manner if needed.
Le 4 janv. 2016 17:14, "Mark Thomas"  a écrit :

> Given that the Tomcat code doesn't contain any classes that implement
> InstanceListener is looks to be unused internally. I'm wondering if
> anyone else is using it. If not, there is a chunk of code we could
> remove including a bunch of (admittedly simple/fast) calls made on every
> request.
>
> Could we deprecate this in 8.0.x and remove it in 9.0.x?
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

svn commit: r1722939 - in /tomcat/trunk: java/org/apache/catalina/core/AsyncContextImpl.java test/org/apache/catalina/core/TestAsyncContextImpl.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Jan  4 18:12:07 2016
New Revision: 1722939

URL: http://svn.apache.org/viewvc?rev=1722939=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58751
Correctly handle the case where an AsyncListener dispatches to a Servlet on an 
asynchronous timeout and the Servlet uses sendError() to trigger 
an error page.
Test case based on code provided by Andy Wilkinson.

Modified:
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=1722939=1722938=1722939=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Mon Jan  4 
18:12:07 2016
@@ -97,6 +97,29 @@ public class AsyncContextImpl implements
 
 @Override
 public void fireOnComplete() {
+// Fire the listeners
+doFireOnComplete();
+
+// The application doesn't know it has to stop read and/or writing 
until
+// it receives the complete event so the request and response have to 
be
+// closed after firing the event.
+try {
+// First of all ensure that any data written to the response is
+// written to the I/O layer.
+request.getResponse().finishResponse();
+// Close the request and the response.
+request.getCoyoteRequest().action(ActionCode.END_REQUEST, null);
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+// Catch this here and allow async context complete to continue
+// normally so a dispatch takes place which ensures that  the
+// request and response objects are correctly recycled.
+log.debug(sm.getString("asyncContextImpl.finishResponseError"), t);
+}
+}
+
+
+private void doFireOnComplete() {
 List listenersCopy = new ArrayList<>();
 listenersCopy.addAll(listeners);
 
@@ -115,25 +138,9 @@ public class AsyncContextImpl implements
 clearServletRequestResponse();
 context.unbind(Globals.IS_SECURITY_ENABLED, oldCL);
 }
-
-// The application doesn't know it has to stop read and/or writing 
until
-// it receives the complete event so the request and response have to 
be
-// closed after firing the event.
-try {
-// First of all ensure that any data written to the response is
-// written to the I/O layer.
-request.getResponse().finishResponse();
-// Close the request and the response.
-request.getCoyoteRequest().action(ActionCode.END_REQUEST, null);
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-// Catch this here and allow async context complete to continue
-// normally so a dispatch takes place which ensures that  the
-// request and response objects are correctly recycled.
-log.debug(sm.getString("asyncContextImpl.finishResponseError"), t);
-}
 }
 
+
 public boolean timeout() {
 AtomicBoolean result = new AtomicBoolean();
 request.getCoyoteRequest().action(ActionCode.ASYNC_TIMEOUT, result);
@@ -383,7 +390,9 @@ public class AsyncContextImpl implements
 dispatch = null;
 runnable.run();
 if (!request.isAsync()) {
-fireOnComplete();
+// Uses internal method since we don't want the 
request/response
+// to be closed. That will be handled in the adapter.
+doFireOnComplete();
 }
 } catch (RuntimeException x) {
 // doInternalComplete(true);

Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1722939=1722938=1722939=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Mon 
Jan  4 18:12:07 2016
@@ -1347,7 +1347,7 @@ public class TestAsyncContextImpl extend
 @Override
 public void service(ServletRequest req, ServletResponse res)
 throws ServletException, IOException {
-res.getWriter().println(ERROR_MESSAGE);
+res.getWriter().print(ERROR_MESSAGE);
 }
 
 }
@@ -2288,4 +2288,74 @@ public class TestAsyncContextImpl extend
 }
 }
 }
+
+
+/*
+ * See 

svn commit: r1722941 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/AsyncContextImpl.java test/org/apache/catalina/core/TestAsyncContextImpl.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Jan  4 18:17:13 2016
New Revision: 1722941

URL: http://svn.apache.org/viewvc?rev=1722941=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58751
Correctly handle the case where an AsyncListener dispatches to a Servlet on an 
asynchronous timeout and the Servlet uses sendError() to trigger 
an error page.
Test case based on code provided by Andy Wilkinson.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  4 18:17:13 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1
 
666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555
 

svn commit: r1722942 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/AsyncContextImpl.java test/org/apache/catalina/core/TestAsyncContextImpl.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Jan  4 18:23:42 2016
New Revision: 1722942

URL: http://svn.apache.org/viewvc?rev=1722942=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58751
Correctly handle the case where an AsyncListener dispatches to a Servlet on an 
asynchronous timeout and the Servlet uses sendError() to trigger 
an error page.
Test case based on code provided by Andy Wilkinson.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  4 18:23:42 2016
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926
-/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
 

[Bug 58751] Strange behaviour after calling sendError when an async request times out

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58751

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|REOPENED|RESOLVED

--- Comment #5 from Mark Thomas  ---
Fixed in 9.0.x for 9.0.0.M2 onwards, 8.0.x for 8.0.31 onwards and 7.0.x for
7.0.68 onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org