Author: rareddy Date: 2010-08-05 16:13:20 -0400 (Thu, 05 Aug 2010) New Revision: 2420 Modified: trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/ClusterableCacheFactory.java Log: TEIID-1185 Modified: trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/ClusterableCacheFactory.java =================================================================== --- trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/ClusterableCacheFactory.java 2010-08-05 17:41:38 UTC (rev 2419) +++ trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/ClusterableCacheFactory.java 2010-08-05 20:13:20 UTC (rev 2420) @@ -64,7 +64,9 @@ @Override public void destroy() { - this.delegate.destroy(); + if (this.delegate != null) { + this.delegate.destroy(); + } } private Object getClusteredCache() {