[infinispan-commits] Infinispan SVN: r265 - trunk/core/src/main/java/org/infinispan/context/container.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-05-12 10:51:58 -0400 (Tue, 12 May 2009)
New Revision: 265

Modified:
   trunk/core/src/main/java/org/infinispan/context/container/ReplicationInvocationContextContainer.java
Log:
Call prepareFor() *before* setting the origin local flag since this gets overwritten

Modified: trunk/core/src/main/java/org/infinispan/context/container/ReplicationInvocationContextContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/container/ReplicationInvocationContextContainer.java	2009-05-12 14:50:58 UTC (rev 264)
+++ trunk/core/src/main/java/org/infinispan/context/container/ReplicationInvocationContextContainer.java	2009-05-12 14:51:58 UTC (rev 265)
@@ -75,8 +75,8 @@
          return contexts.updateThreadContextAndReturn(context);
       } else {
          contexts.initNonTxInvocationContext();
+         if (prepareForCall) contexts.nonTxInvocationContext.prepareForCall();
          contexts.nonTxInvocationContext.setOriginLocal(true);
-         if (prepareForCall) contexts.nonTxInvocationContext.prepareForCall();
          return contexts.updateThreadContextAndReturn(contexts.nonTxInvocationContext);
       }
    }