[Jboss-cvs] JBossAS SVN: r55975 - branches/JBoss_3_2_7_CP/cluster/src/main/org/jboss/ha/framework/server

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

Author: ryan.campbell at jboss.com
Date: 2006-08-15 16:56:15 -0400 (Tue, 15 Aug 2006)
New Revision: 55975

Modified:
   branches/JBoss_3_2_7_CP/cluster/src/main/org/jboss/ha/framework/server/HAPartitionImpl.java
Log:
merged JBAS-2187Test patch for 3.2.7 (HAPartitionImpl)
uses the correct classloader rather than the system classloader to de-serialize the arguments of a remote Group-RPC

Modified: branches/JBoss_3_2_7_CP/cluster/src/main/org/jboss/ha/framework/server/HAPartitionImpl.java
===================================================================
--- branches/JBoss_3_2_7_CP/cluster/src/main/org/jboss/ha/framework/server/HAPartitionImpl.java	2006-08-15 20:05:05 UTC (rev 55974)
+++ branches/JBoss_3_2_7_CP/cluster/src/main/org/jboss/ha/framework/server/HAPartitionImpl.java	2006-08-15 20:56:15 UTC (rev 55975)
@@ -50,6 +50,7 @@
 import org.jboss.naming.NonSerializableFactory;
 import org.jboss.logging.Logger;
 
+
 /**
  * This class is an abstraction class for a JGroups RPCDispatch and JChannel.
  * It is a default implementation of HAPartition for the
@@ -774,23 +775,23 @@
          log.trace("Partition " + partitionName + " received msg");
       if(req == null || req.getBuffer() == null)
       {
-         log.warn("RpcProtocol.Handle(): message or message buffer is null !");
+         log.warn("message or message buffer is null !");
          return null;
       }
 
       try
       {
-         body = Util.objectFromByteBuffer(req.getBuffer());
+         body = objectFromByteBuffer(req.getBuffer());
       }
       catch(Exception e)
       {
-         log.warn("RpcProtocol.Handle(): " + e);
+         log.warn("failed unmarshalling method call (req=" + req + ")", e);
          return null;
       }
       
       if(body == null || !(body instanceof MethodCall))
       {
-         log.warn("RpcProtocol.Handle(): message does not contain a MethodCall object !");
+         log.warn("message does not contain a MethodCall object !");
          return null;
       }