svn commit: r1163864 - /commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java

[markt]

Author: markt
Date: Wed Aug 31 23:10:53 2011
New Revision: 1163864

URL: http://svn.apache.org/viewvc?rev=1163864&view=rev
Log:
Stop multiple calls to close() triggering an JMX error

Modified:
    
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java

Modified: 
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1163864&r1=1163863&r2=1163864&view=diff
==============================================================================
--- 
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
 (original)
+++ 
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
 Wed Aug 31 23:10:53 2011
@@ -1098,7 +1098,10 @@ public class GenericKeyedObjectPool<K,T>
          evictionIterator = null;
          evictionKeyIterator = null;
          startEvictor(-1L);
-         ManagementFactory.getPlatformMBeanServer().unregisterMBean(oname);
+         if (oname != null) {
+             ManagementFactory.getPlatformMBeanServer().unregisterMBean(oname);
+             oname = null;
+         }
      }