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

[Manik Surtani]

  User: msurtani
  Date: 07/01/15 06:22:38

  Modified:    src/org/jboss/cache  CacheImpl.java
  Log:
  Tests marshalling of return values
  
  Revision  Changes    Path
  1.27      +13 -5     JBossCache/src/org/jboss/cache/CacheImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/CacheImpl.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -b -r1.26 -r1.27
  --- CacheImpl.java	12 Jan 2007 22:59:00 -0000	1.26
  +++ CacheImpl.java	15 Jan 2007 11:22:38 -0000	1.27
  @@ -98,7 +98,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: CacheImpl.java,v 1.26 2007/01/12 22:59:00 bstansberry Exp $
  + * @version $Id: CacheImpl.java,v 1.27 2007/01/15 11:22:38 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -689,8 +689,7 @@
               disp = new InactiveRegionAwareRpcDispatcher(channel, ml, this, this);
               //            disp = new RpcDispatcher(channel, ml, this, this);
   
  -
  -            disp.setMarshaller(getMarshaller());
  +            disp.setRequestMarshaller(getMarshaller());
   
               setBuddyReplicationConfig(configuration.getBuddyReplicationConfig());
               break;
  @@ -2706,7 +2705,16 @@
            InvocationContext ctx = getInvocationContext();
            ctx.setOriginLocal(false);
            setInvocationContext(ctx);
  -         return invokeMethod(method_call);
  +         Object retVal = invokeMethod(method_call);
  +         // we only need to return values for a set of remote calls; not every call.
  +         if (MethodDeclarations.returnValueForRemoteCall(method_call.getMethodId()))
  +         {
  +            return retVal;
  +         }
  +         else
  +         {
  +            return null;
  +         }
         }
         catch (Exception ex)
         {
  @@ -2833,7 +2841,7 @@
            return GravitateResult.noDataFound();
         }
   
  -      if (backupNodeFqn == null)
  +      if (backupNodeFqn == null && searchSubtrees)
         {
            backupNodeFqn = BuddyManager.getBackupFqn(BuddyManager.getGroupNameFromAddress(getLocalAddress()), fqn);
         }