[jboss-cvs] JBossAS SVN: r104963 - in projects/cluster/ha-server-cache-jbc/branches/Branch_2_0: src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2010-05-18 23:10:27 -0400 (Tue, 18 May 2010)
New Revision: 104963

Modified:
   projects/cluster/ha-server-cache-jbc/branches/Branch_2_0/pom.xml
   projects/cluster/ha-server-cache-jbc/branches/Branch_2_0/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AbstractJBossCacheService.java
Log:
[JBCLUSTER-270] Avoid invoking on wrapped object

Modified: projects/cluster/ha-server-cache-jbc/branches/Branch_2_0/pom.xml
===================================================================
--- projects/cluster/ha-server-cache-jbc/branches/Branch_2_0/pom.xml	2010-05-19 02:16:50 UTC (rev 104962)
+++ projects/cluster/ha-server-cache-jbc/branches/Branch_2_0/pom.xml	2010-05-19 03:10:27 UTC (rev 104963)
@@ -30,10 +30,10 @@
   
   <properties>
     <version.jboss.ha.server.cache.spi>2.0.0.GA</version.jboss.ha.server.cache.spi>
-    <version.jboss.ha.server.api>1.1.0.GA</version.jboss.ha.server.api>
+    <version.jboss.ha.server.api>1.1.2.Final</version.jboss.ha.server.api>
     <version.jboss.common.core>2.2.12.GA</version.jboss.common.core>
     <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
-    <version.jboss.cache>3.2.4.GA</version.jboss.cache>
+    <version.jboss.cache>3.2.5.GA</version.jboss.cache>
     <!-- This should be [2.6.2,3.0.0) but maven complains about it -->
     <version.jgroups>2.6.15.GA</version.jgroups>
     <version.jboss.cache.pojo>3.0.0.GA</version.jboss.cache.pojo>

Modified: projects/cluster/ha-server-cache-jbc/branches/Branch_2_0/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AbstractJBossCacheService.java
===================================================================
--- projects/cluster/ha-server-cache-jbc/branches/Branch_2_0/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AbstractJBossCacheService.java	2010-05-19 02:16:50 UTC (rev 104962)
+++ projects/cluster/ha-server-cache-jbc/branches/Branch_2_0/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AbstractJBossCacheService.java	2010-05-19 03:10:27 UTC (rev 104963)
@@ -47,7 +47,6 @@
 import org.jboss.cache.config.CacheLoaderConfig;
 import org.jboss.cache.pojo.impl.InternalConstant;
 import org.jboss.cache.transaction.BatchModeTransactionManager;
-import org.jboss.ha.framework.interfaces.CachableMarshalledValue;
 import org.jboss.ha.framework.server.CacheManagerLocator;
 import org.jboss.ha.framework.server.MarshalledValueHelper;
 import org.jboss.ha.framework.server.SimpleCachableMarshalledValue;
@@ -685,8 +684,7 @@
          {
             try
             {
-               CachableMarshalledValue mv = SessionSerializationFactory.createMarshalledValue((Serializable) value);
-               return mv;
+               return new SimpleCachableMarshalledValue((Serializable) value, SessionSerializationFactory.getObjectStreamSource(), true);
             }
             catch (ClassCastException e)
             {