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

[Manik Surtani]

  User: msurtani
  Date: 06/09/13 06:56:35

  Modified:    src/org/jboss/cache  Tag: Branch_JBossCache_1_4_0
                        TreeCache.java
  Log:
  JBCACHE-766
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.195.2.9 +15 -2     JBossCache/src/org/jboss/cache/TreeCache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCache.java,v
  retrieving revision 1.195.2.8
  retrieving revision 1.195.2.9
  diff -u -b -r1.195.2.8 -r1.195.2.9
  --- TreeCache.java	11 Aug 2006 19:59:14 -0000	1.195.2.8
  +++ TreeCache.java	13 Sep 2006 10:56:34 -0000	1.195.2.9
  @@ -79,7 +79,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: TreeCache.java,v 1.195.2.8 2006/08/11 19:59:14 bstansberry Exp $
  + * @version $Id: TreeCache.java,v 1.195.2.9 2006/09/13 10:56:34 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -4824,7 +4824,20 @@
         try
         {
            getInvocationContext().setOriginLocal(false);
  -         return invokeMethod(method_call);
  +
  +         Object result = invokeMethod(method_call);
  +
  +         // Patch from Owen Taylor - JBCACHE-766
  +         // We replicating, we don't need to return the return value of the put-key-value
  +         // methods and the return values will cause marshalling problems, so we
  +         // omit them.
  +         JBCMethodCall jbcCall = (JBCMethodCall) method_call;
  +         if (jbcCall.getMethodId() == MethodDeclarations.putKeyValMethodLocal_id ||
  +                 jbcCall.getMethodId() == MethodDeclarations.putFailFastKeyValueMethodLocal_id ||
  +                 jbcCall.getMethodId() == MethodDeclarations.removeKeyMethodLocal_id)
  +            return null;
  +         else
  +            return result;
         }
         catch (Exception ex)
         {