svn commit: r1568965 - in /commons/proper/dbcp/trunk/src: changes/changes.xml main/java/org/apache/commons/dbcp2/DelegatingConnection.java
Author: markt Date: Mon Feb 17 12:41:47 2014 New Revision: 1568965 URL: http://svn.apache.org/r1568965 Log: isValid should not trigger an exception if the connection is closed. Modified: commons/proper/dbcp/trunk/src/changes/changes.xml commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java Modified: commons/proper/dbcp/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/changes/changes.xml?rev=1568965&r1=1568964&r2=1568965&view=diff == --- commons/proper/dbcp/trunk/src/changes/changes.xml (original) +++ commons/proper/dbcp/trunk/src/changes/changes.xml Mon Feb 17 12:41:47 2014 @@ -168,6 +168,10 @@ The type attribute can be add,u Provide an option to set the default query timeout. + +Connection.isValid() should not throw an SQLException if the connection +is closed. + Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java?rev=1568965&r1=1568964&r2=1568965&view=diff == --- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java (original) +++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java Mon Feb 17 12:41:47 2014 @@ -914,7 +914,9 @@ public class DelegatingConnection
svn commit: r1568981 - in /commons/proper/dbcp/trunk/src: changes/ main/java/org/apache/commons/dbcp2/ main/java/org/apache/commons/dbcp2/datasources/ site/xdoc/ test/java/org/apache/commons/dbcp2/dat
Author: markt
Date: Mon Feb 17 13:22:33 2014
New Revision: 1568981
URL: http://svn.apache.org/r1568981
Log:
Fix DBCP-357. Use Connection.isValid() to validate connections unless a
validation query has been defined.
Modified:
commons/proper/dbcp/trunk/src/changes/changes.xml
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
commons/proper/dbcp/trunk/src/site/xdoc/configuration.xml
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java
Modified: commons/proper/dbcp/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/changes/changes.xml?rev=1568981&r1=1568980&r2=1568981&view=diff
==
--- commons/proper/dbcp/trunk/src/changes/changes.xml (original)
+++ commons/proper/dbcp/trunk/src/changes/changes.xml Mon Feb 17 13:22:33 2014
@@ -172,6 +172,13 @@ The type attribute can be add,u
Connection.isValid() should not throw an SQLException if the connection
is closed.
+
+Use Connection.isValid() to validate connections unless a validation
+query is explicitly configured. Note that this means it is no longer
+necessary for a validation query to be specified in order for
validation
+to take place. When testing with Oracle, this resulted in database
+validation being approximately 7 times faster.
+
Modified:
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java?rev=1568981&r1=1568980&r2=1568981&view=diff
==
---
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
(original)
+++
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
Mon Feb 17 13:22:33 2014
@@ -696,8 +696,7 @@ public class BasicDataSource
/**
* Sets the {@link #testOnBorrow} property. This property determines
* whether or not the pool will validate objects before they are borrowed
- * from the pool. For a true value to have any effect, the
- * validationQuery property must be set to a non-null string.
+ * from the pool.
*
* @param testOnBorrow new value for testOnBorrow property
*/
@@ -728,8 +727,7 @@ public class BasicDataSource
/**
* Sets the testOnReturn property. This property determines
* whether or not the pool will validate objects before they are returned
- * to the pool. For a true value to have any effect, the
- * validationQuery property must be set to a non-null string.
+ * to the pool.
*
* @param testOnReturn new value for testOnReturn property
*/
@@ -940,9 +938,7 @@ public class BasicDataSource
/**
* Sets the testWhileIdle property. This property determines
- * whether or not the idle object evictor will validate connections. For a
- * true value to have any effect, the
- * validationQuery property must be set to a non-null string.
+ * whether or not the idle object evictor will validate connections.
*
* @param testWhileIdle new value for testWhileIdle property
*/
@@ -1080,7 +1076,8 @@ public class BasicDataSource
* The SQL query that will be used to validate connections from this pool
* before returning them to the caller. If specified, this query
* MUST be an SQL SELECT statement that returns at least
- * one row.
+ * one row. If not specified, {@link Connection#isValid(int)} will be used
+ * to validate connections.
*/
private volatile String validationQuery = null;
@@ -2016,13 +2013,6 @@ public class BasicDataSource
}
}
-// Can't test without a valid
svn commit: r1568985 - in /commons/proper/dbcp/trunk: doc/ src/main/java/org/apache/commons/dbcp2/ src/main/java/org/apache/commons/dbcp2/datasources/ src/site/xdoc/ src/site/xdoc/guide/ src/test/java
Author: markt
Date: Mon Feb 17 13:33:43 2014
New Revision: 1568985
URL: http://svn.apache.org/r1568985
Log:
Complete rename of maxActive to maxTotal
Modified:
commons/proper/dbcp/trunk/doc/abandon.jsp
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/package.html
commons/proper/dbcp/trunk/src/site/xdoc/configuration.xml
commons/proper/dbcp/trunk/src/site/xdoc/guide/jndi-howto.xml
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
Modified: commons/proper/dbcp/trunk/doc/abandon.jsp
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/abandon.jsp?rev=1568985&r1=1568984&r2=1568985&view=diff
==
--- commons/proper/dbcp/trunk/doc/abandon.jsp (original)
+++ commons/proper/dbcp/trunk/doc/abandon.jsp Mon Feb 17 13:33:43 2014
@@ -38,7 +38,7 @@
removeAbandonedTimeout0
logAbandonedtrue
- maxActive1
+ maxTotal1
-->
Modified:
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java?rev=1568985&r1=1568984&r2=1568985&view=diff
==
---
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
(original)
+++
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
Mon Feb 17 13:33:43 2014
@@ -1617,7 +1617,7 @@ public class BasicDataSource
* {@link #getRemoveAbandonedOnBorrow()} or
* {@link #getRemoveAbandonedOnMaintenance()} = true
* {@link #getNumIdle() numIdle} < 2
- * {@link #getNumActive() numActive} > {@link #getMaxTotal()
maxActive} - 3
+ * {@link #getNumActive() numActive} > {@link #getMaxTotal()
maxTotal} - 3
*
*
* The default value is 300 seconds.
Modified:
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java?rev=1568985&r1=1568984&r2=1568985&view=diff
==
---
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
(original)
+++
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
Mon Feb 17 13:33:43 2014
@@ -58,7 +58,7 @@ public class BasicDataSourceFactory impl
private final static String PROP_CACHESTATE ="cacheState";
private final static String PROP_DRIVERCLASSNAME = "driverClassName";
private final static String PROP_LIFO = "lifo";
-private final static String PROP_MAXACTIVE = "maxActive";
+private final static String PROP_MAXTOTAL = "maxTotal";
private final static String PROP_MAXIDLE = "maxIdle";
private final static String PROP_MINIDLE = "minIdle";
private final static String PROP_INITIALSIZE = "initialSize";
@@ -105,7 +105,7 @@ public class BasicDataSourceFactory impl
PROP_CACHESTATE,
PROP_DRIVERCLASSNAME,
PROP_LIFO,
-PROP_MAXACTIVE,
+PROP_MAXTOTAL,
PROP_MAXIDLE,
PROP_MINIDLE,
PROP_INITIALSIZE,
@@ -254,7 +254,7 @@ public class BasicDataSourceFactory impl
dataSource.setLifo(Boolean.valueOf(value).booleanValue());
}
-value = properties.getProperty(PROP_MAXACTIVE);
+value = properties.getProperty(PROP_MAXTOTAL);
if (value != null) {
dataSource.setMaxTotal(Integer.parseInt(value));
}
Modified:
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/package.html
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/package.html?rev=1568985&r1=1568984&r2=1568985&view=diff
==
---
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/package.html
(original)
+++
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/package.html
Mon Feb 17 13:33:43 2014
@@ -49,7 +49,7 @@ webapp:
dataSourceName java:comp/env/jdbc/bookstoreCPDS
- defaultMaxActive 30
+ defaultMaxTotal 30
@@ -150,7 +150,7 @@ public clas
svn commit: r1569016 - in /commons/proper/pool/trunk/src: changes/ main/java/org/apache/commons/pool2/impl/ test/java/org/apache/commons/pool2/impl/
Author: markt
Date: Mon Feb 17 15:11:40 2014
New Revision: 1569016
URL: http://svn.apache.org/r1569016
Log:
Add an option inspired by DBCP-249 to validate an object when it is created
Modified:
commons/proper/pool/trunk/src/changes/changes.xml
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolMXBean.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolMXBean.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
Modified: commons/proper/pool/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/changes/changes.xml?rev=1569016&r1=1569015&r2=1569016&view=diff
==
--- commons/proper/pool/trunk/src/changes/changes.xml (original)
+++ commons/proper/pool/trunk/src/changes/changes.xml Mon Feb 17 15:11:40 2014
@@ -44,7 +44,8 @@ The type attribute can be add,u
+"This is a maintenance release that add a new testOnCreate configuration option
+and fixes a small number of bugs.">
Ensure that if an attempt is made to return an object multiple times that
the current active and idle object counts are not corrupted.
@@ -55,6 +56,10 @@ The type attribute can be add,u
Fix the remaining Javadoc warnings.
+
+ Add a new validation configuration option testOnCreate that tests an
+ object immediately after it is created.
+
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java?rev=1569016&r1=1569015&r2=1569016&view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
Mon Feb 17 15:11:40 2014
@@ -68,6 +68,8 @@ public abstract class BaseGenericObjectP
private volatile long maxWaitMillis =
BaseObjectPoolConfig.DEFAULT_MAX_WAIT_MILLIS;
private volatile boolean lifo = BaseObjectPoolConfig.DEFAULT_LIFO;
+private volatile boolean testOnCreate =
+BaseObjectPoolConfig.DEFAULT_TEST_ON_CREATE;
private volatile boolean testOnBorrow =
BaseObjectPoolConfig.DEFAULT_TEST_ON_BORROW;
private volatile boolean testOnReturn =
@@ -271,6 +273,39 @@ public abstract class BaseGenericObjectP
}
/**
+ * Returns whether objects created for the pool will be validated before
+ * being returned from the borrowObject() method. Validation
is
+ * performed by the validateObject() method of the factory
+ * associated with the pool. If the object fails to validate, then
+ * borrowObject() will fail.
+ *
+ * @return true if newly created objects are validated before
+ * being returned from the borrowObject() method
+ *
+ * @see #setTestOnCreate
+ */
+public final boolean getTestOnCreate() {
+return testOnCreate;
+}
+
+/**
+ * Sets whether objects created for the pool will be validated before
+ * being returned from the borrowObject() method. Validation
is
+ * performed by the validateObject() method of the factory
+ * associated with the pool. If the object fails to validate, then
+ * borrowObject() will fail.
+ *
+ * @param testOnCreate true if newly created objects should
be
+ * validated before being returned from the
+ * borrowObject() method
+ *
+ * @see #getTestOnCreate
+ */
+public final void setTestOnCreate(boolean testOnCreate) {
+this.testOnCreate = testOnCreate;
+}
+
+/**
* Returns whether objects borrowed from the pool will be validated before
* being returned from the borrowObject() method. Validation
is
* performed by the validateObject() method of the factory
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java?rev=1569016&r1=1569015&r2=1569016&view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
(original)
+++
c
svn commit: r1569019 - /commons/proper/pool/trunk/
Author: markt Date: Mon Feb 17 15:18:35 2014 New Revision: 1569019 URL: http://svn.apache.org/r1569019 Log: Ignore local site build Modified: commons/proper/pool/trunk/ (props changed) Propchange: commons/proper/pool/trunk/ -- --- svn:ignore (original) +++ svn:ignore Mon Feb 17 15:18:35 2014 @@ -16,3 +16,4 @@ velocity.log maven-eclipse.xml .externalToolBuilders *.iml +site-content
svn commit: r1569027 - in /commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl: BaseGenericObjectPool.java BaseObjectPoolConfig.java GenericKeyedObjectPoolMXBean.java GenericObjectPo
Author: markt
Date: Mon Feb 17 15:43:09 2014
New Revision: 1569027
URL: http://svn.apache.org/r1569027
Log:
Add @since markers for testOnCreate changes
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolMXBean.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolMXBean.java
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java?rev=1569027&r1=1569026&r2=1569027&view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
Mon Feb 17 15:43:09 2014
@@ -283,6 +283,8 @@ public abstract class BaseGenericObjectP
* being returned from the borrowObject() method
*
* @see #setTestOnCreate
+ *
+ * @since 2.2
*/
public final boolean getTestOnCreate() {
return testOnCreate;
@@ -300,6 +302,8 @@ public abstract class BaseGenericObjectP
* borrowObject() method
*
* @see #getTestOnCreate
+ *
+ * @since 2.2
*/
public final void setTestOnCreate(boolean testOnCreate) {
this.testOnCreate = testOnCreate;
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java?rev=1569027&r1=1569026&r2=1569027&view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
Mon Feb 17 15:43:09 2014
@@ -72,6 +72,8 @@ public abstract class BaseObjectPoolConf
* The default value for the {@code testOnCreate} configuration attribute.
* @see GenericObjectPool#getTestOnCreate()
* @see GenericKeyedObjectPool#getTestOnCreate()
+ *
+ * @since 2.2
*/
public static final boolean DEFAULT_TEST_ON_CREATE = false;
@@ -334,6 +336,8 @@ public abstract class BaseObjectPoolConf
*
* @see GenericObjectPool#getTestOnCreate()
* @see GenericKeyedObjectPool#getTestOnCreate()
+ *
+ * @since 2.2
*/
public boolean getTestOnCreate() {
return testOnCreate;
@@ -348,6 +352,8 @@ public abstract class BaseObjectPoolConf
*
* @see GenericObjectPool#getTestOnCreate()
* @see GenericKeyedObjectPool#getTestOnCreate()
+ *
+ * @since 2.2
*/
public void setTestOnCreate(boolean testOnCreate) {
this.testOnCreate = testOnCreate;
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolMXBean.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolMXBean.java?rev=1569027&r1=1569026&r2=1569027&view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolMXBean.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolMXBean.java
Mon Feb 17 15:43:09 2014
@@ -91,6 +91,7 @@ public interface GenericKeyedObjectPoolM
/**
* See {@link GenericKeyedObjectPool#getTestOnCreate()}
* @return See {@link GenericKeyedObjectPool#getTestOnCreate()}
+ * @since 2.2
*/
boolean getTestOnCreate();
/**
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolMXBean.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolMXBean.java?rev=1569027&r1=1569026&r2=1569027&view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolMXBean.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolMXBean.java
Mon Feb 17 15:43:09 2014
@@ -83,6 +83,7 @@ public interface GenericObjectPoolMXBean
/**
* See {@link GenericObjectPool#getTestOnCreate()}
* @return See {@link GenericObjectPool#getTestOnCreate()}
+ * @sin
svn commit: r1569028 - in /commons/proper/lang/trunk/src: changes/ main/java/org/apache/commons/lang3/builder/ test/java/org/apache/commons/lang3/builder/
Author: kinow
Date: Mon Feb 17 15:45:17 2014
New Revision: 1569028
URL: http://svn.apache.org/r1569028
Log:
LANG-621: ReflectionToStringBuilder.toString does not debug 3rd party object
fields within 3rd party object. Suggested by Philip Hodges. Final patch from
Thomas Neidhart.
Added:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/RecursiveToStringStyleTest.java
Modified:
commons/proper/lang/trunk/src/changes/changes.xml
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
Modified: commons/proper/lang/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/changes/changes.xml?rev=1569028&r1=1569027&r2=1569028&view=diff
==
--- commons/proper/lang/trunk/src/changes/changes.xml [utf-8] (original)
+++ commons/proper/lang/trunk/src/changes/changes.xml [utf-8] Mon Feb 17
15:45:17 2014
@@ -22,6 +22,7 @@
+ReflectionToStringBuilder.toString does not debug 3rd party
object fields within 3rd party object
Add
methods for removing all invalid characters according to XML 1.0 and XML 1.1 in
an input string to StringEscapeUtils
NumericEntityEscaper incorrectly encodes supplementary
characters
Make some private fields
final
Added:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java?rev=1569028&view=auto
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java
(added)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java
Mon Feb 17 15:45:17 2014
@@ -0,0 +1,84 @@
+package org.apache.commons.lang3.builder;
+
+import java.util.Collection;
+
+import org.apache.commons.lang3.ClassUtils;
+
+/**
+ * Works with {@link ToStringBuilder} to create a "deep"
toString.
+ *
+ * To use this class write code as follows:
+ *
+ *
+ * public class Job {
+ * String title;
+ * ...
+ * }
+ *
+ * public class Person {
+ * String name;
+ * int age;
+ * boolean smoker;
+ * Job job;
+ *
+ * ...
+ *
+ * public String toString() {
+ * return new ReflectionToStringBuilder(this, new
RecursiveToStringStyle()).toString();
+ * }
+ * }
+ *
+ *
+ * This will produce a toString of the format:
+ *
Person@7f54[name=Stephen,age=29,smoker=false,job=Job@43cd2[title=Manager]]
+ *
+ * @since 3.2
+ * @version $Id$
+ */
+public class RecursiveToStringStyle extends ToStringStyle {
+
+/**
+ * Required for serialization support.
+ *
+ * @see java.io.Serializable
+ */
+private static final long serialVersionUID = 1L;
+
+/**
+ * Constructor.
+ */
+public RecursiveToStringStyle() {
+super();
+}
+
+@Override
+public void appendDetail(StringBuffer buffer, String fieldName, Object
value) {
+if (!ClassUtils.isPrimitiveWrapper(value.getClass()) &&
+!String.class.equals(value.getClass()) &&
+accept(value.getClass())) {
+buffer.append(ReflectionToStringBuilder.toString(value, this));
+} else {
+super.appendDetail(buffer, fieldName, value);
+}
+}
+
+@Override
+protected void appendDetail(StringBuffer buffer, String fieldName,
Collection coll) {
+appendClassName(buffer, coll);
+appendIdentityHashCode(buffer, coll);
+appendDetail(buffer, fieldName, coll.toArray());
+}
+
+/**
+ * Returns whether or not to recursively format the given
Class.
+ * By default, this method always returns {@code true}, but may be
overwritten by
+ * sub-classes to filter specific classes.
+ *
+ * @param clazz
+ *The class to test.
+ * @return Whether or not to recursively format the given
Class.
+ */
+protected boolean accept(final Class clazz) {
+return true;
+}
+}
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java?rev=1569028&r1=1569027&r2=1569028&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
Mon Feb 17 15:45:17 2014
@@ -81,7 +81,12 @@ import org.apache.commons
svn commit: r1569031 - /commons/proper/pool/trunk/src/site/xdoc/download_pool.xml
Author: markt Date: Mon Feb 17 15:51:26 2014 New Revision: 1569031 URL: http://svn.apache.org/r1569031 Log: Update ready for Commons Pool 2.2 release Modified: commons/proper/pool/trunk/src/site/xdoc/download_pool.xml Modified: commons/proper/pool/trunk/src/site/xdoc/download_pool.xml URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/site/xdoc/download_pool.xml?rev=1569031&r1=1569030&r2=1569031&view=diff == --- commons/proper/pool/trunk/src/site/xdoc/download_pool.xml (original) +++ commons/proper/pool/trunk/src/site/xdoc/download_pool.xml Mon Feb 17 15:51:26 2014 @@ -95,32 +95,32 @@ limitations under the License. - + - commons-pool2-2.1-bin.tar.gz - http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.1-bin.tar.gz.md5";>md5 - http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.1-bin.tar.gz.asc";>pgp + commons-pool2-2.2-bin.tar.gz + http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz.md5";>md5 + http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz.asc";>pgp - commons-pool2-2.1-bin.zip - http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.1-bin.zip.md5";>md5 - http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.1-bin.zip.asc";>pgp + commons-pool2-2.2-bin.zip + http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.2-bin.zip.md5";>md5 + http://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.2-bin.zip.asc";>pgp - commons-pool2-2.1-src.tar.gz - http://www.apache.org/dist/commons/pool/source/commons-pool2-2.1-src.tar.gz.md5";>md5 - http://www.apache.org/dist/commons/pool/source/commons-pool2-2.1-src.tar.gz.asc";>pgp + commons-pool2-2.2-src.tar.gz + http://www.apache.org/dist/commons/pool/source/commons-pool2-2.2-src.tar.gz.md5";>md5 + http://www.apache.org/dist/commons/pool/source/commons-pool2-2.2-src.tar.gz.asc";>pgp - commons-pool2-2.1-src.zip - http://www.apache.org/dist/commons/pool/source/commons-pool2-2.1-src.zip.md5";>md5 - http://www.apache.org/dist/commons/pool/source/commons-pool2-2.1-src.zip.asc";>pgp + commons-pool2-2.2-src.zip + http://www.apache.org/dist/commons/pool/source/commons-pool2-2.2-src.zip.md5";>md5 + http://www.apache.org/dist/commons/pool/source/commons-pool2-2.2-src.zip.asc";>pgp
svn commit: r1569033 - /commons/proper/pool/trunk/RELEASE-NOTES.txt
Author: markt Date: Mon Feb 17 15:57:49 2014 New Revision: 1569033 URL: http://svn.apache.org/r1569033 Log: Update release notes ready for 2.2 Modified: commons/proper/pool/trunk/RELEASE-NOTES.txt Modified: commons/proper/pool/trunk/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/RELEASE-NOTES.txt?rev=1569033&r1=1569032&r2=1569033&view=diff == --- commons/proper/pool/trunk/RELEASE-NOTES.txt (original) +++ commons/proper/pool/trunk/RELEASE-NOTES.txt Mon Feb 17 15:57:49 2014 @@ -1,39 +1,28 @@ - Apache Commons Pool 2.1 RELEASE NOTES + Apache Commons Pool 2.2 RELEASE NOTES -The Apache Commons Pool team is pleased to announce the release of Apache Commons Pool 2.1. +The Apache Commons Pool team is pleased to announce the release of Apache Commons Pool 2.2. Apache Commons Pool provides an object-pooling API and a number of object pool implementations. Version 2 contains a completely re-written pooling implementation compared to the 1.x series. In addition to performance and scalability improvements, version 2 includes robust instance tracking and pool monitoring. Version 2 requires JDK level 1.6 or above. -No client code changes are required to migrate from version 2.0 to 2.1. Users of version 1.x +No client code changes are required to migrate from version 2.1 to 2.2. Users of version 1.x should consult the migration guide on the Commons Pool web site. -This is a maintenance release that includes a small number of new features as well as -including bugfixes and test case improvements. +This is a maintenance release that add a new testOnCreate configuration option and fixes a small number of bugs. -Changes in version 2.1 include: +Changes in version 2.2 include: New features: -o POOL-241: Expand the coverage of the unit tests. Thanks to Bruno P. Kinoshita. -oProvide more control over the names under which Pools are registered in - JMX so components using the pools can register the pools they use under a - related name. -oInclude the number of times an object has been borrowed from the Pool when - the DefaultPooledObject wrapper is used and expose this property via JMX. -o POOL-245: Further expansion of the coverage of the unit tests. Thanks to Bruno P. Kinoshita. +oAdd a new validation configuration option testOnCreate that tests an + object immediately after it is created. Fixed Bugs: -o POOL-243: Added missing create counter decrement in GenericKeyedObjectPool create method on factory - exception path. Prior to this fix, exceptions thrown by factory makeObject calls could leak - per key capacity. Thanks to Michal Sabo. -o POOL-240: Ensured that blocked threads waiting on a depleted pool get served when - objects are destroyed due to validation or passivation failures in - returnObject or when a checked out instance is invalidated. Thanks to Dan McNulty. -o POOL-245: Remove a duplicate null check and fix some typos in PoolUtils. Thanks to Bruno P. Kinoshita. -o POOL-246: Make the toString() method of ErodingKeyedObjectPool consistent with the - other pools. Thanks to Bruno P. Kinoshita. +o POOL-248: Ensure that if an attempt is made to return an object multiple times that + the current active and idle object counts are not corrupted. Thanks to Warren Chen. +o POOL-249: Fix Javadoc issues when building docs with Java 8. Thanks to Ville Skyttä. +oFix the remaining Javadoc warnings.
svn commit: r1569053 - in /commons/proper/lang/trunk/src: main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java test/java/org/apache/commons/lang3/builder/RecursiveToStringStyleTest.j
Author: britter Date: Mon Feb 17 16:41:27 2014 New Revision: 1569053 URL: http://svn.apache.org/r1569053 Log: Set svn keywords Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java (props changed) commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/RecursiveToStringStyleTest.java (props changed) Propchange: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java -- svn:eol-style = native Propchange: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java -- svn:keywords = Date Author Id Revision HeadURL Propchange: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/RecursiveToStringStyleTest.java -- svn:eol-style = native Propchange: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/RecursiveToStringStyleTest.java -- svn:keywords = Date Author Id Revision HeadURL
svn commit: r1569061 - /commons/proper/weaver/trunk/pom.xml
Author: mbenson
Date: Mon Feb 17 17:29:10 2014
New Revision: 1569061
URL: http://svn.apache.org/r1569061
Log:
try adding changes:check as release preparation goal
Modified:
commons/proper/weaver/trunk/pom.xml
Modified: commons/proper/weaver/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/pom.xml?rev=1569061&r1=1569060&r2=1569061&view=diff
==
--- commons/proper/weaver/trunk/pom.xml (original)
+++ commons/proper/weaver/trunk/pom.xml Mon Feb 17 17:29:10 2014
@@ -481,6 +481,7 @@ under the License.
maven-release-plugin
${commons.release.version}_${commons.rc.version}
+ changes:check
svn commit: r1569062 - /commons/proper/weaver/trunk/pom.xml
Author: mbenson
Date: Mon Feb 17 17:34:52 2014
New Revision: 1569062
URL: http://svn.apache.org/r1569062
Log:
use right goal name, autoVersionSubmodules
Modified:
commons/proper/weaver/trunk/pom.xml
Modified: commons/proper/weaver/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/pom.xml?rev=1569062&r1=1569061&r2=1569062&view=diff
==
--- commons/proper/weaver/trunk/pom.xml (original)
+++ commons/proper/weaver/trunk/pom.xml Mon Feb 17 17:34:52 2014
@@ -480,8 +480,9 @@ under the License.
org.apache.maven.plugins
maven-release-plugin
+ true
${commons.release.version}_${commons.rc.version}
- changes:check
+ changes:changes-check
svn commit: r1569079 - /commons/proper/pool/trunk/pom.xml
Author: markt Date: Mon Feb 17 18:39:54 2014 New Revision: 1569079 URL: http://svn.apache.org/r1569079 Log: Update version Modified: commons/proper/pool/trunk/pom.xml Modified: commons/proper/pool/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/pom.xml?rev=1569079&r1=1569078&r2=1569079&view=diff == --- commons/proper/pool/trunk/pom.xml (original) +++ commons/proper/pool/trunk/pom.xml Mon Feb 17 18:39:54 2014 @@ -150,7 +150,7 @@ 1.6 1.6 pool2 -2.1 +2.2 (Java 6.0+) 1.6 (Java 5.0+)
svn commit: r1569084 - /commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/InlineProperties.java
Author: mbenson
Date: Mon Feb 17 18:54:10 2014
New Revision: 1569084
URL: http://svn.apache.org/r1569084
Log:
checkstyle cleanup
Modified:
commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/InlineProperties.java
Modified:
commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/InlineProperties.java
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/InlineProperties.java?rev=1569084&r1=1569083&r2=1569084&view=diff
==
---
commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/InlineProperties.java
(original)
+++
commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/InlineProperties.java
Mon Feb 17 18:54:10 2014
@@ -21,7 +21,6 @@ package org.apache.commons.weaver.ant;
import java.util.Properties;
import org.apache.commons.lang3.StringUtils;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DynamicElementNS;
/**
@@ -70,9 +69,10 @@ public class InlineProperties implements
* @param uri String URI
* @param localName local element name
* @param qName qualified name
+ * @return InlineProperty
*/
@Override
-public Object createDynamicElement(String uri, String localName, String
qName) throws BuildException {
+public InlineProperty createDynamicElement(String uri, String localName,
String qName) {
return new InlineProperty(localName);
}
}
\ No newline at end of file
svn commit: r1569090 - in /commons/proper/pool/tags/POOL_2_2_RC1: ./ pom.xml
Author: markt Date: Mon Feb 17 19:25:20 2014 New Revision: 1569090 URL: http://svn.apache.org/r1569090 Log: Tagged Pool 2.2 RC1 Added: commons/proper/pool/tags/POOL_2_2_RC1/ - copied from r1569089, commons/proper/pool/trunk/ Modified: commons/proper/pool/tags/POOL_2_2_RC1/pom.xml Modified: commons/proper/pool/tags/POOL_2_2_RC1/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/pool/tags/POOL_2_2_RC1/pom.xml?rev=1569090&r1=1569089&r2=1569090&view=diff == --- commons/proper/pool/tags/POOL_2_2_RC1/pom.xml (original) +++ commons/proper/pool/tags/POOL_2_2_RC1/pom.xml Mon Feb 17 19:25:20 2014 @@ -26,7 +26,7 @@ 4.0.0 commons-pool2 - 2.2-SNAPSHOT + 2.2 Apache Commons Pool 2001
svn commit: r1569096 - /commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
Author: markt
Date: Mon Feb 17 19:38:31 2014
New Revision: 1569096
URL: http://svn.apache.org/r1569096
Log:
Functionality this was testing has been removed.
Modified:
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
Modified:
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java?rev=1569096&r1=1569095&r2=1569096&view=diff
==
---
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
(original)
+++
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
Mon Feb 17 19:38:31 2014
@@ -337,20 +337,6 @@ public class TestBasicDataSource extends
assertEquals(false, ds.getTestWhileIdle());
}
-public void testNoValidationQuery() throws Exception {
-ds.setTestOnBorrow(true);
-ds.setTestOnReturn(true);
-ds.setTestWhileIdle(true);
-ds.setValidationQuery("");
-
-Connection conn = ds.getConnection();
-conn.close();
-
-assertEquals(false, ds.getTestOnBorrow());
-assertEquals(false, ds.getTestOnReturn());
-assertEquals(false, ds.getTestWhileIdle());
-}
-
public void testDefaultCatalog() throws Exception {
Connection[] c = new Connection[getMaxTotal()];
for (int i = 0; i < c.length; i++) {
svn commit: r1569097 - /commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
Author: markt
Date: Mon Feb 17 19:39:01 2014
New Revision: 1569097
URL: http://svn.apache.org/r1569097
Log:
Now validation is using isValid() it needs a basic implementation here.
Modified:
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
Modified:
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterConnection.java?rev=1569097&r1=1569096&r2=1569097&view=diff
==
---
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
(original)
+++
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
Mon Feb 17 19:39:01 2014
@@ -361,7 +361,7 @@ public class TesterConnection implements
@Override
public boolean isValid(int timeout) throws SQLException {
-throw new SQLException("Not implemented.");
+return _open;
}
@Override
svn commit: r4424 - in /dev/commons/pool: binaries/ source/
Author: markt Date: Mon Feb 17 20:36:05 2014 New Revision: 4424 Log: Pool 2.2 RC1 Added: dev/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz (with props) dev/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz.asc dev/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz.md5 dev/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz.sha1 dev/commons/pool/binaries/commons-pool2-2.2-bin.zip (with props) dev/commons/pool/binaries/commons-pool2-2.2-bin.zip.asc dev/commons/pool/binaries/commons-pool2-2.2-bin.zip.md5 dev/commons/pool/binaries/commons-pool2-2.2-bin.zip.sha1 dev/commons/pool/source/commons-pool2-2.2-src.tar.gz (with props) dev/commons/pool/source/commons-pool2-2.2-src.tar.gz.asc dev/commons/pool/source/commons-pool2-2.2-src.tar.gz.md5 dev/commons/pool/source/commons-pool2-2.2-src.tar.gz.sha1 dev/commons/pool/source/commons-pool2-2.2-src.zip (with props) dev/commons/pool/source/commons-pool2-2.2-src.zip.asc dev/commons/pool/source/commons-pool2-2.2-src.zip.md5 dev/commons/pool/source/commons-pool2-2.2-src.zip.sha1 Added: dev/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz == Binary file - no diff available. Propchange: dev/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz -- svn:mime-type = application/x-gzip Added: dev/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz.asc == --- dev/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz.asc (added) +++ dev/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz.asc Mon Feb 17 20:36:05 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJTAm3GAAoJEBDAHFovYFnnWFMQAPMon1Ens2sa9V7O0/nWsD5A +k7dJMBO4PJFvUu7dwIHhfRtwmlKe7KAukbQVGbmtpbBTLemrPYitFomx99/h5kAB +BUdD9qsXHKDWd0UyuuPY8N5az0UP9vaz7F7Q2zvoNFixejo2RqiWGnFmHRCYjp6d +ED674CLu4Mym93ItQPj0REeGIHHlibfE7nw6DYWVqQWiAqNHpcADhmQxVgoYAWBo +hE/44A5q6UaqkzdFYSy+RwVCHFMx20toLho15hZTngaXvYbBWdSnXHmDjJXYwSdf +aSKrFpJT8ODxMxWRvCarulM8/kOKwIdF4LFpd/20sTh+Q8fCkFMZ9TzCXm6vN1xQ +q1hIq3L9owYrZAzh9J5B/SwdG2YVQrvw6KWxJhhzcE1DgvaUFIWTtWEUQWTkhQai +uBAavJitZmXEmUFBpyvxVfK32MmtX6MyQaDxqkUWBvxCup1ycfn4F9zkLZiu3xcG +Lax3V81+Mppbm0V1KuTa169FXWeo+2g/f/3E/wlHJae9B+b2IAvhwZsX35a06xhr +yU16LCaYy0GCMMVAbQ29J5pC13zuZHSG4rUW51nutb54cgwYKyr4oyGPPebwd+pH +CNT7n6IJxTPAcN67qKHT+VZlVwPvdJwJ8MbEjsbK0twVNemRag8dzPa+qFfvladF +a3SpE5OV6ZcwfadqwLbo +=OiHK +-END PGP SIGNATURE- Added: dev/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz.md5 == --- dev/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz.md5 (added) +++ dev/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz.md5 Mon Feb 17 20:36:05 2014 @@ -0,0 +1 @@ +f82562a27c6920355d65f2144bd71915 *commons-pool2-2.2-bin.tar.gz Added: dev/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz.sha1 == --- dev/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz.sha1 (added) +++ dev/commons/pool/binaries/commons-pool2-2.2-bin.tar.gz.sha1 Mon Feb 17 20:36:05 2014 @@ -0,0 +1 @@ +602DD4557FE82D329F3745E37EFFA4AC00ACF4E5 \ No newline at end of file Added: dev/commons/pool/binaries/commons-pool2-2.2-bin.zip == Binary file - no diff available. Propchange: dev/commons/pool/binaries/commons-pool2-2.2-bin.zip -- svn:mime-type = application/octet-stream Added: dev/commons/pool/binaries/commons-pool2-2.2-bin.zip.asc == --- dev/commons/pool/binaries/commons-pool2-2.2-bin.zip.asc (added) +++ dev/commons/pool/binaries/commons-pool2-2.2-bin.zip.asc Mon Feb 17 20:36:05 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJTAm3HAAoJEBDAHFovYFnnaH8P/jNf6PTwA7wktZgtg0LDrPhi +o/SN6kEoOt2I5FOOs4fD77qd5DNF7ICVoPh2zfWiXlhjeqBX9ZBYxTSyGUJLHZ6J +VFeNMdjUcgs8+wJ/kqaZsy/1Y5N+dY+FyJp0g5mUbbG+jzFabYY3yJjvUA1EaNT4 +FlvRsTek1ILxVuwB5L0ppn/8/XnM71VTA37zQ0Cuq95IbavBMbeUKU/HREN2cEAm +1qn4qr+SbvD/0eUL1kw8fItnhHhlmICluk5tKmY1c9CgU44eSR2qnb5UtMFWcvI7 +8Jsw9Rt2Kx3iJ9r6d/vt8xeCRuTz7tFU7DKCfL+p5vwjuFDmIUnoKoOR0wdraUtG +0xI1EL/4wcdVr0sTGiDK2zExUSmctCWGGW79sCZ6P+U///PspZb6a+qMTUDXWvUG +lfuXcC1aHltWDjIGLyET0dXn/RXrKg9AfUv8uI7x18CwfGCmHx8dPKIhbuuVy5gr +9ZulGmLpFCcDZlBPQMUI/yIfK+Kk+9OP2kP6bQD6w/MtG5DdTpNnI7DfErye18LJ +odEgSPud6sixVThq3f1rvGmNQL1tedOQFawjGbOcR1iGCo7E61a0yqUzv1ooheN6 +cfC1GXCvLyJyA8LrRJeZOUWxQr5h4UhzzVP+CqEVCHiWVG18dmUdrrmyT/ynflrV +xQvXiB5dzJRND19LyLSE +=dvxL +-END PGP SIGNATURE- Added: dev/commons/pool/binaries/commons-pool2-2.2-bin.
svn commit: r4426 - in /dev/commons/pool: ./ binaries/ source/
Author: markt Date: Mon Feb 17 22:40:02 2014 New Revision: 4426 Log: Drop 2.1, add 2.2 release notes Removed: dev/commons/pool/binaries/commons-pool2-2.1-bin.tar.gz dev/commons/pool/binaries/commons-pool2-2.1-bin.tar.gz.asc dev/commons/pool/binaries/commons-pool2-2.1-bin.tar.gz.md5 dev/commons/pool/binaries/commons-pool2-2.1-bin.tar.gz.sha1 dev/commons/pool/binaries/commons-pool2-2.1-bin.zip dev/commons/pool/binaries/commons-pool2-2.1-bin.zip.asc dev/commons/pool/binaries/commons-pool2-2.1-bin.zip.md5 dev/commons/pool/binaries/commons-pool2-2.1-bin.zip.sha1 dev/commons/pool/source/commons-pool2-2.1-src.tar.gz dev/commons/pool/source/commons-pool2-2.1-src.tar.gz.asc dev/commons/pool/source/commons-pool2-2.1-src.tar.gz.md5 dev/commons/pool/source/commons-pool2-2.1-src.tar.gz.sha1 dev/commons/pool/source/commons-pool2-2.1-src.zip dev/commons/pool/source/commons-pool2-2.1-src.zip.asc dev/commons/pool/source/commons-pool2-2.1-src.zip.md5 dev/commons/pool/source/commons-pool2-2.1-src.zip.sha1 Modified: dev/commons/pool/RELEASE-NOTES.txt Modified: dev/commons/pool/RELEASE-NOTES.txt == --- dev/commons/pool/RELEASE-NOTES.txt (original) +++ dev/commons/pool/RELEASE-NOTES.txt Mon Feb 17 22:40:02 2014 @@ -1,39 +1,28 @@ - Apache Commons Pool 2.1 RELEASE NOTES + Apache Commons Pool 2.2 RELEASE NOTES -The Apache Commons Pool team is pleased to announce the release of Apache Commons Pool 2.1. +The Apache Commons Pool team is pleased to announce the release of Apache Commons Pool 2.2. Apache Commons Pool provides an object-pooling API and a number of object pool implementations. Version 2 contains a completely re-written pooling implementation compared to the 1.x series. In addition to performance and scalability improvements, version 2 includes robust instance tracking and pool monitoring. Version 2 requires JDK level 1.6 or above. -No client code changes are required to migrate from version 2.0 to 2.1. Users of version 1.x +No client code changes are required to migrate from version 2.1 to 2.2. Users of version 1.x should consult the migration guide on the Commons Pool web site. -This is a maintenance release that includes a small number of new features as well as -including bugfixes and test case improvements. +This is a maintenance release that add a new testOnCreate configuration option and fixes a small number of bugs. -Changes in version 2.1 include: +Changes in version 2.2 include: New features: -o POOL-241: Expand the coverage of the unit tests. Thanks to Bruno P. Kinoshita. -oProvide more control over the names under which Pools are registered in - JMX so components using the pools can register the pools they use under a - related name. -oInclude the number of times an object has been borrowed from the Pool when - the DefaultPooledObject wrapper is used and expose this property via JMX. -o POOL-245: Further expansion of the coverage of the unit tests. Thanks to Bruno P. Kinoshita. +oAdd a new validation configuration option testOnCreate that tests an + object immediately after it is created. Fixed Bugs: -o POOL-243: Added missing create counter decrement in GenericKeyedObjectPool create method on factory - exception path. Prior to this fix, exceptions thrown by factory makeObject calls could leak - per key capacity. Thanks to Michal Sabo. -o POOL-240: Ensured that blocked threads waiting on a depleted pool get served when - objects are destroyed due to validation or passivation failures in - returnObject or when a checked out instance is invalidated. Thanks to Dan McNulty. -o POOL-245: Remove a duplicate null check and fix some typos in PoolUtils. Thanks to Bruno P. Kinoshita. -o POOL-246: Make the toString() method of ErodingKeyedObjectPool consistent with the - other pools. Thanks to Bruno P. Kinoshita. +o POOL-248: Ensure that if an attempt is made to return an object multiple times that + the current active and idle object counts are not corrupted. Thanks to Warren Chen. +o POOL-249: Fix Javadoc issues when building docs with Java 8. Thanks to Ville Skyttä. +oFix the remaining Javadoc warnings.
svn commit: r1569132 - /commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
Author: sebb
Date: Mon Feb 17 22:41:56 2014
New Revision: 1569132
URL: http://svn.apache.org/r1569132
Log:
FILEUPLOAD-247 DiskFileItem does not check fields for null before derefencing
them
Fix get() and finalize()
Modified:
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
Modified:
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
URL:
http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java?rev=1569132&r1=1569131&r2=1569132&view=diff
==
---
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
(original)
+++
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
Mon Feb 17 22:41:56 2014
@@ -297,11 +297,12 @@ public class DiskFileItem
* contents of the file were not yet cached in memory, they will be
* loaded from the disk storage and cached.
*
- * @return The contents of the file as an array of bytes.
+ * @return The contents of the file as an array of bytes
+ * or {@code null} if the data cannot be read
*/
public byte[] get() {
if (isInMemory()) {
-if (cachedContent == null) {
+if (cachedContent == null && dfos != null) {
cachedContent = dfos.getData();
}
return cachedContent;
@@ -542,6 +543,9 @@ public class DiskFileItem
*/
@Override
protected void finalize() {
+if (dfos == null) {
+return;
+}
File outputFile = dfos.getFile();
if (outputFile != null && outputFile.exists()) {
svn commit: r1569187 - /commons/proper/io/trunk/pom.xml
Author: ggregory Date: Tue Feb 18 04:45:04 2014 New Revision: 1569187 URL: http://svn.apache.org/r1569187 Log: Update to commons-parent 33. Modified: commons/proper/io/trunk/pom.xml Modified: commons/proper/io/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/pom.xml?rev=1569187&r1=1569186&r2=1569187&view=diff == --- commons/proper/io/trunk/pom.xml (original) +++ commons/proper/io/trunk/pom.xml Tue Feb 18 04:45:04 2014 @@ -19,7 +19,7 @@ org.apache.commons commons-parent -32 +33 4.0.0 commons-io
svn commit: r898352 - in /websites/production/commons/content/proper/commons-io: ./ apidocs/ apidocs/org/apache/commons/io/ apidocs/org/apache/commons/io/class-use/ apidocs/org/apache/commons/io/compa
Author: ggregory Date: Tue Feb 18 05:13:19 2014 New Revision: 898352 Log: Site checkin for project Apache Commons IO [This commit notification would consist of 285 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r898355 - /websites/production/commons/content/proper/bcel/
Author: ggregory Date: Tue Feb 18 05:32:44 2014 New Revision: 898355 Log: Automatic svn path creation: https://svn.apache.org/repos/infra/websites/production/commons/content/proper/bcel Added: websites/production/commons/content/proper/bcel/
svn commit: r898356 - in /websites/production/commons/content/proper/bcel: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/bcel/ apidocs/org/apache/bcel/class-use/ apidocs/org/apache/b
Author: ggregory Date: Tue Feb 18 05:44:40 2014 New Revision: 898356 Log: Site checkin for project Apache Commons BCEL [This commit notification would consist of 399 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
