You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2012/05/05 12:15:12 UTC
svn commit: r1334381 - in
/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl:
GenericKeyedObjectPool.java GenericObjectPool.java
Author: sebb
Date: Sat May 5 10:15:12 2012
New Revision: 1334381
URL: http://svn.apache.org/viewvc?rev=1334381&view=rev
Log:
Ensure JMX entries are tidied up before throwing IAE
Modified:
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/GenericObjectPool.java
Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1334381&r1=1334380&r2=1334381&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java Sat May 5 10:15:12 2012
@@ -99,6 +99,7 @@ public class GenericKeyedObjectPool<K,T>
super(config, ONAME_BASE, config.getJmxNamePrefix());
if (factory == null) {
+ jmxUnregister(); // tidy up
throw new IllegalArgumentException("factory may not be null");
}
this.factory = factory;
Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1334381&r1=1334380&r2=1334381&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java Sat May 5 10:15:12 2012
@@ -81,6 +81,7 @@ public class GenericObjectPool<T> extend
super(config, ONAME_BASE, config.getJmxNamePrefix());
if (factory == null) {
+ jmxUnregister(); // tidy up
throw new IllegalArgumentException("factory may not be null");
}
this.factory = factory;