[jboss-cvs] JBossAS SVN: r63634 - branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/ha/framework/server.

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

Author: vivekl at redhat.com
Date: 2007-06-25 15:50:43 -0400 (Mon, 25 Jun 2007)
New Revision: 63634

Modified:
   branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/ha/framework/server/HAPartitionImpl.java
Log:
ASPATCH-194: JBAS-2199: Test patch for case 5292 (HAPartitionImpl backport from 4.0 branch)



Modified: branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/ha/framework/server/HAPartitionImpl.java
===================================================================
--- branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/ha/framework/server/HAPartitionImpl.java	2007-06-25 19:18:06 UTC (rev 63633)
+++ branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/ha/framework/server/HAPartitionImpl.java	2007-06-25 19:50:43 UTC (rev 63634)
@@ -7,49 +7,33 @@
 
 package org.jboss.ha.framework.server;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Vector;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NameNotFoundException;
-import javax.naming.Reference;
-import javax.naming.StringRefAddr;
-import javax.management.MBeanServer;
-
 import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
-
+import org.jboss.ha.framework.interfaces.ClusterNode;
+import org.jboss.ha.framework.interfaces.DistributedReplicantManager;
+import org.jboss.ha.framework.interfaces.DistributedState;
+import org.jboss.ha.framework.interfaces.HAPartition;
+import org.jboss.invocation.MarshalledValueInputStream;
+import org.jboss.invocation.MarshalledValueOutputStream;
+import org.jboss.logging.Logger;
+import org.jboss.naming.NonSerializableFactory;
 import org.jgroups.JChannel;
 import org.jgroups.MergeView;
-import org.jgroups.View;
 import org.jgroups.Message;
+import org.jgroups.View;
 import org.jgroups.blocks.GroupRequest;
 import org.jgroups.blocks.MethodCall;
 import org.jgroups.stack.IpAddress;
 import org.jgroups.util.Rsp;
 import org.jgroups.util.RspList;
-import org.jgroups.util.Util;
 
-import org.jboss.invocation.MarshalledValueInputStream;
-import org.jboss.invocation.MarshalledValueOutputStream;
-import org.jboss.ha.framework.interfaces.DistributedReplicantManager;
-import org.jboss.ha.framework.interfaces.DistributedState;
-import org.jboss.ha.framework.interfaces.HAPartition;
-import org.jboss.ha.framework.interfaces.HAPartition.HAPartitionStateTransfer;
-import org.jboss.ha.framework.interfaces.HAPartition.HAMembershipListener;
-import org.jboss.ha.framework.interfaces.ClusterNode;
+import javax.management.MBeanServer;
+import javax.naming.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
-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
@@ -791,17 +775,17 @@
       
       try
       {
-         body = Util.objectFromByteBuffer(req.getBuffer());
+         body = objectFromByteBuffer(req.getBuffer());
       }
       catch(Exception e)
       {
-         log.warn("RpcProtocol.Handle(): " + e);
+         log.warn("failed unmarshalling request " + 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;
       }