Author: bstansberry(a)jboss.com Date: 2008-01-14 17:50:46 -0500 (Mon, 14 Jan 2008) New Revision: 5128 Modified: core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java Log: Avoid NPEs in destroy() Modified: core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java 2008-01-14 21:46:01 UTC (rev 5127) +++ core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java 2008-01-14 22:50:46 UTC (rev 5128) @@ -680,7 +680,8 @@ // in JMX, even if we didn't register them in create unregisterInterceptors(); - cache.destroy(); + if (cache != null) + cache.destroy(); } finally {