[jboss-cvs] JBossAS SVN: r60490 - trunk/cluster/src/main/org/jboss/ha/framework/server.

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

Author: jerrygauth
Date: 2007-02-12 09:07:31 -0500 (Mon, 12 Feb 2007)
New Revision: 60490

Modified:
   trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
Log:
JBAS-3583

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java	2007-02-12 08:22:28 UTC (rev 60489)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java	2007-02-12 14:07:31 UTC (rev 60490)
@@ -259,7 +259,8 @@
       dispatcher.setMembershipListener(this);
       log.debug("setMessageListener");
       dispatcher.setMessageListener(messageListener);
-      dispatcher.setMarshaller(new MarshallerImpl());
+      dispatcher.setRequestMarshaller(new RequestMarshallerImpl());
+      dispatcher.setResponseMarshaller(new ResponseMarshallerImpl());
       
       // FIXME remove once @JMX issues are sorted
       if (replicantManager == null)
@@ -1607,7 +1608,7 @@
       Vector originatingGroups;
    }
    
-   private static class MarshallerImpl implements org.jgroups.blocks.RpcDispatcher.Marshaller
+   private static class RequestMarshallerImpl implements org.jgroups.blocks.RpcDispatcher.Marshaller
    {
 
       public Object objectFromByteBuffer(byte[] buf) throws Exception
@@ -1621,6 +1622,20 @@
       }      
    }
    
+   private static class ResponseMarshallerImpl implements org.jgroups.blocks.RpcDispatcher.Marshaller
+   {
+
+      public Object objectFromByteBuffer(byte[] buf) throws Exception
+      {
+         return ClusterPartition.objectFromByteBuffer(buf);
+      }
+
+      public byte[] objectToByteBuffer(Object obj) throws Exception
+      {
+         return ClusterPartition.objectToByteBuffer(obj);
+      }      
+   }
+   
    /**
     * Overrides RpcDispatcher.Handle so that we can dispatch to many 
     * different objects.