Author: bstansberry(a)jboss.com Date: 2008-06-09 18:36:38 -0400 (Mon, 09 Jun 2008) New Revision: 14757 Modified: core/trunk/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/SharedCacheInstanceManager.java Log: [HHH-3340] Don't fail if cache TM != discovered TM Modified: core/trunk/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/SharedCacheInstanceManager.java =================================================================== --- core/trunk/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/SharedCacheInstanceManager.java 2008-06-09 22:27:40 UTC (rev 14756) +++ core/trunk/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/SharedCacheInstanceManager.java 2008-06-09 22:36:38 UTC (rev 14757) @@ -216,8 +216,8 @@ if (!safeEquals(tm, cacheTm)) { if (cache.getCacheStatus() != CacheStatus.INSTANTIATED && cache.getCacheStatus() != CacheStatus.DESTROYED) { - throw new CacheException("JBoss Cache is already started " + "with a transaction manager (" - + cacheTm + ") that doesn't match our own (" + tm + ")"); + log.debug("JBoss Cache is already started with a transaction manager (" + + cacheTm + ") that is not equal to our own (" + tm + ")"); } else { // Configure the cache to use our TM cacheConfig.getRuntimeConfig().setTransactionManager(tm);