Author: sohil.shah(a)jboss.com Date: 2007-12-06 17:36:55 -0500 (Thu, 06 Dec 2007) New Revision: 9317 Modified: branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/hibernate/JMXTreeCacheProvider.java Log: JBPORTAL-1839 - problem with deployment of clustered portal Modified: branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/hibernate/JMXTreeCacheProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/hibernate/JMXTreeCacheProvider.java 2007-12-06 17:09:54 UTC (rev 9316) +++ branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/hibernate/JMXTreeCacheProvider.java 2007-12-06 22:36:55 UTC (rev 9317) @@ -26,6 +26,7 @@ import org.hibernate.cache.Cache; import org.hibernate.cache.CacheException; import org.hibernate.cache.CacheProvider; +import org.hibernate.cache.OptimisticTreeCache; import org.hibernate.cache.TreeCache; import org.jboss.mx.util.MBeanProxy; import org.jboss.mx.util.MBeanServerLocator; @@ -63,7 +64,21 @@ MBeanServer server = MBeanServerLocator.locateJBoss(); TreeCacheProvider provider = (TreeCacheProvider)MBeanProxy.get(TreeCacheProvider.class, providerName, server); org.jboss.cache.TreeCache cache = provider.getTreeCache(); - return new TreeCache(cache, regionName, cache.getTransactionManager()); + + //Select the proper type of hibernate cache to be used + Cache hibernateCache = null; + if(cache.getNodeLockingScheme().equalsIgnoreCase("OPTIMISTIC")) + { + log.debug("Selecting Optimistic Cache"); + hibernateCache = new OptimisticTreeCache(cache, regionName); + } + else + { + log.debug("Selecting regular Tree Cache"); + hibernateCache = new TreeCache(cache, regionName, cache.getTransactionManager()); + } + + return hibernateCache; } catch (Exception e) {