[jboss-cvs] JBossCache/src/org/jboss/cache/marshall ...

[Manik Surtani]

  User: msurtani
  Date: 06/09/07 06:43:49

  Modified:    src/org/jboss/cache/marshall  TreeCacheMarshaller200.java
  Log:
  Refactored tx interceptor so the invocation context interceptor sets up the context initially.  Also Reverted to write/readObject for Strings
  
  Revision  Changes    Path
  1.5       +4 -3      JBossCache/src/org/jboss/cache/marshall/TreeCacheMarshaller200.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCacheMarshaller200.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/TreeCacheMarshaller200.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- TreeCacheMarshaller200.java	5 Sep 2006 13:12:53 -0000	1.4
  +++ TreeCacheMarshaller200.java	7 Sep 2006 10:43:49 -0000	1.5
  @@ -12,7 +12,6 @@
   import org.jboss.cache.Fqn;
   import org.jboss.cache.GlobalTransaction;
   import org.jboss.cache.rpc.RpcTreeCache;
  -import org.jboss.serial.util.StringUtil;
   import org.jgroups.Address;
   import org.jgroups.stack.IpAddress;
   
  @@ -280,7 +279,8 @@
   
      private void marshallString(String s, ObjectOutputStream out) throws Exception
      {
  -      StringUtil.saveString(out, s);
  +      //StringUtil.saveString(out, s);
  +      out.writeObject(s);
      }
   
      private void marshallMethodCall(MethodCall methodCall, ObjectOutputStream out, Map refMap) throws Exception
  @@ -433,7 +433,8 @@
   
      private String unmarshallString(ObjectInputStream in) throws Exception
      {
  -      return StringUtil.readString(in, null);
  +      //return StringUtil.readString(in, null);
  +      return (String) in.readObject();
      }
   
      private MethodCall unmarshallMethodCall(ObjectInputStream in, Map refMap) throws Exception