Author: jason.greene(a)jboss.com Date: 2008-01-16 17:36:22 -0500 (Wed, 16 Jan 2008) New Revision: 5152 Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.java Log: Merge 5127 Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.java =================================================================== --- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.java 2008-01-16 22:17:11 UTC (rev 5151) +++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.java 2008-01-16 22:36:22 UTC (rev 5152) @@ -251,13 +251,15 @@ { cacheStatus = CacheStatus.DESTROYING; - pojoCache.destroy(); + if (pojoCache != null) + pojoCache.destroy(); // The cache is destroyed, so we shouldn't leave it registered // in JMX even if we didn't register it in create() unregisterPlainCache(); - plainCacheWrapper.destroy(); + if (plainCacheWrapper != null) + plainCacheWrapper.destroy(); } finally {