[infinispan-commits] Infinispan SVN: r281 - in trunk: core/src/main/java/org/infinispan/atomic and 14 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Wed May 13 09:58:20 EDT 2009
Author: mircea.markus
Date: 2009-05-13 09:58:20 -0400 (Wed, 13 May 2009)
New Revision: 281
Modified:
trunk/core/src/main/java/org/infinispan/CacheDelegate.java
trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapProxy.java
trunk/core/src/main/java/org/infinispan/commands/remote/BaseRpcCommand.java
trunk/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java
trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java
trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
trunk/core/src/main/java/org/infinispan/context/InvocationContextContainer.java
trunk/core/src/main/java/org/infinispan/context/InvocationContextContainerImpl.java
trunk/core/src/main/java/org/infinispan/context/impl/NonTxInvocationContext.java
trunk/core/src/main/java/org/infinispan/interceptors/BatchingInterceptor.java
trunk/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoader.java
trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferManagerImpl.java
trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java
trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java
trunk/core/src/test/java/org/infinispan/api/mvcc/LockAssert.java
trunk/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java
trunk/core/src/test/java/org/infinispan/test/AbstractCacheTest.java
trunk/core/src/test/java/org/infinispan/test/TestingUtil.java
trunk/tree/src/main/java/org/infinispan/tree/NodeImpl.java
trunk/tree/src/main/java/org/infinispan/tree/TreeCacheImpl.java
trunk/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java
Log:
ICC renamings
Modified: trunk/core/src/main/java/org/infinispan/CacheDelegate.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/CacheDelegate.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/main/java/org/infinispan/CacheDelegate.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -227,7 +227,7 @@
}
private InvocationContext getInvocationContext() {
- return icc.getLocalInvocationContext();
+ return icc.createInvocationContext();
}
public void lock(K key) {
Modified: trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapProxy.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapProxy.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapProxy.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -125,7 +125,7 @@
public V put(K key, V value) {
try {
startAtomic();
- InvocationContext ctx = icc.getLocalInvocationContext();
+ InvocationContext ctx = icc.createInvocationContext();
AtomicHashMap<K, V> deltaMapForWrite = getDeltaMapForWrite(ctx);
return deltaMapForWrite.put(key, value);
}
@@ -137,7 +137,7 @@
public V remove(Object key) {
try {
startAtomic();
- InvocationContext ic = icc.getLocalInvocationContext();
+ InvocationContext ic = icc.createInvocationContext();
return getDeltaMapForWrite(ic).remove(key);
}
finally {
@@ -148,7 +148,7 @@
public void putAll(Map<? extends K, ? extends V> m) {
try {
startAtomic();
- InvocationContext ic = icc.getLocalInvocationContext();
+ InvocationContext ic = icc.createInvocationContext();
getDeltaMapForWrite(ic).putAll(m);
}
finally {
@@ -159,7 +159,7 @@
public void clear() {
try {
startAtomic();
- InvocationContext ic = icc.getLocalInvocationContext();
+ InvocationContext ic = icc.createInvocationContext();
getDeltaMapForWrite(ic).clear();
}
finally {
Modified: trunk/core/src/main/java/org/infinispan/commands/remote/BaseRpcCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/remote/BaseRpcCommand.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/main/java/org/infinispan/commands/remote/BaseRpcCommand.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -40,7 +40,7 @@
protected final Object processVisitableCommand(ReplicableCommand cacheCommand) throws Throwable {
if (cacheCommand instanceof VisitableCommand) {
- InvocationContext ctx = icc.getRemoteNonTxInvocationContext();
+ InvocationContext ctx = icc.createRemoteInvocationContext();
if (trace) log.trace("Invoking command " + cacheCommand + ", with originLocal flag set to " + ctx.isOriginLocal() + ".");
return interceptorChain.invoke(ctx, (VisitableCommand) cacheCommand);
// we only need to return values for a set of remote calls; not every call.
Modified: trunk/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -82,7 +82,7 @@
// hack -> the call is here to make sure that the current thread is associated with
// the remote InvocationCOntext in order to make sure that ClusterCL won't trigger a recurring cluster get
// which might result in infinite loops
- icc.getRemoteNonTxInvocationContext();
+ icc.createRemoteInvocationContext();
// lookup
if (cacheLoaderManager != null && cacheLoaderManager.getCacheLoader() != null) {
cacheEntry = cacheLoaderManager.getCacheLoader().load(key);
Modified: trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -75,7 +75,7 @@
if (trace) log.info("Not found RemoteTransaction for tx id: " + globalTx);
return null;
}
- RemoteTxInvocationContext ctxt = icc.getRemoteTxInvocationContext();
+ RemoteTxInvocationContext ctxt = icc.createRemoteTxInvocationContext();
ctxt.setRemoteTransaction(transaction);
try {
if (trace) log.trace("About to execute tx command :" + this);
Modified: trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -80,7 +80,7 @@
RemoteTransaction remoteTransaction = txTable.createRemoteTransaction(globalTx, modifications);
//2. then set it on the invocation context
- RemoteTxInvocationContext ctx = icc.getRemoteTxInvocationContext();
+ RemoteTxInvocationContext ctx = icc.createRemoteTxInvocationContext();
ctx.setRemoteTransaction(remoteTransaction);
if (trace) log.trace("Invoking remotly orginated prepare: " + this);
Modified: trunk/core/src/main/java/org/infinispan/context/InvocationContextContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/InvocationContextContainer.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/main/java/org/infinispan/context/InvocationContextContainer.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -22,28 +22,28 @@
* If we are in a tx scope this will return an {@link org.infinispan.context.impl.TxInvocationContext}. Otherwise it
* will return an {@link org.infinispan.context.impl.NonTxInvocationContext}. Either way, both context will be marked
* as local, i.e. {@link InvocationContext#isOriginLocal()} will be true. The context is also associated with the
- * current thread, so further calls to {@link #getThreadContext()} will return same instace.
+ * current thread, so further calls to {@link #getInvocationContext()} will return same instace.
*/
- InvocationContext getLocalInvocationContext();
+ InvocationContext createInvocationContext();
/**
* Returns a {@link org.infinispan.context.impl.LocalTxInvocationContext}. The context is also associated with the
- * current thread, so further calls to {@link #getThreadContext()} will return same instace.
+ * current thread, so further calls to {@link #getInvocationContext()} will return same instace.
*/
- LocalTxInvocationContext getLocalTxInvocationContext();
+ LocalTxInvocationContext createTxInvocationContext();
/**
* Returns an {@link org.infinispan.context.impl.RemoteTxInvocationContext}. The context is also associated with the
- * current thread, so further calls to {@link #getThreadContext()} will return same instace.
+ * current thread, so further calls to {@link #getInvocationContext()} will return same instace.
*/
- RemoteTxInvocationContext getRemoteTxInvocationContext();
+ RemoteTxInvocationContext createRemoteTxInvocationContext();
/**
* Returns an {@link org.infinispan.context.impl.NonTxInvocationContext} whose {@link
* org.infinispan.context.impl.NonTxInvocationContext#isOriginLocal()} flag will be true. The context is also
- * associated with the current thread, so further calls to {@link #getThreadContext()} will return same instace.
+ * associated with the current thread, so further calls to {@link #getInvocationContext()} will return same instace.
*/
- InvocationContext getRemoteNonTxInvocationContext();
+ InvocationContext createRemoteInvocationContext();
/**
* Returns the {@link InvocationContext} that is currently associated with the calling thread. Important:
@@ -52,7 +52,7 @@
*
* @throws IllegalStateException if there is no context associated with the current thread.
*/
- InvocationContext getThreadContext();
+ InvocationContext getInvocationContext();
/**
* Dissasociates thread's invocation context and returns the existing value.
Modified: trunk/core/src/main/java/org/infinispan/context/InvocationContextContainerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/InvocationContextContainerImpl.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/main/java/org/infinispan/context/InvocationContextContainerImpl.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -59,7 +59,7 @@
this.transactionTable = transactionTable;
}
- public InvocationContext getLocalInvocationContext() {
+ public InvocationContext createInvocationContext() {
Transaction tx = getRunningTx();
InvocationContext existing = icTl.get();
if (tx != null) {
@@ -81,13 +81,12 @@
} else {
nonTxContext = (NonTxInvocationContext) existing;
}
- nonTxContext.prepareForCall();
nonTxContext.setOriginLocal(true);
return nonTxContext;
}
}
- public LocalTxInvocationContext getLocalTxInvocationContext() {
+ public LocalTxInvocationContext createTxInvocationContext() {
InvocationContext existing = icTl.get();
if (existing != null && existing instanceof LocalTxInvocationContext) {
return (LocalTxInvocationContext) existing;
@@ -97,7 +96,7 @@
return localTxContext;
}
- public RemoteTxInvocationContext getRemoteTxInvocationContext() {
+ public RemoteTxInvocationContext createRemoteTxInvocationContext() {
InvocationContext existing = icTl.get();
if (existing != null && existing instanceof RemoteTxInvocationContext) {
return (RemoteTxInvocationContext) existing;
@@ -107,11 +106,10 @@
return remoteTxContext;
}
- public NonTxInvocationContext getRemoteNonTxInvocationContext() {
+ public NonTxInvocationContext createRemoteInvocationContext() {
InvocationContext existing = icTl.get();
if (existing != null && existing instanceof NonTxInvocationContext) {
NonTxInvocationContext context = (NonTxInvocationContext) existing;
- context.prepareForCall();
context.setOriginLocal(false);
return context;
}
@@ -121,7 +119,7 @@
return remoteNonTxContext;
}
- public InvocationContext getThreadContext() {
+ public InvocationContext getInvocationContext() {
InvocationContext invocationContext = icTl.get();
if (invocationContext == null)
throw new IllegalStateException("This method can only be called after associating the current thread with a context");
Modified: trunk/core/src/main/java/org/infinispan/context/impl/NonTxInvocationContext.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/impl/NonTxInvocationContext.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/main/java/org/infinispan/context/impl/NonTxInvocationContext.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -65,8 +65,9 @@
if (lookedUpEntries == null) lookedUpEntries = new BidirectionalLinkedHashMap<Object, CacheEntry>(4);
}
- public void prepareForCall() {
- reset();
+ @Override
+ public void reset() {
+ super.reset();
clearLookedUpEntries();
}
Modified: trunk/core/src/main/java/org/infinispan/interceptors/BatchingInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/BatchingInterceptor.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/main/java/org/infinispan/interceptors/BatchingInterceptor.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -63,7 +63,7 @@
try {
transactionManager.resume(tx);
//this will make the call with a tx invocation context
- return invokeNextInterceptor(icc.getLocalInvocationContext(), command);
+ return invokeNextInterceptor(icc.createInvocationContext(), command);
} finally {
if (transactionManager.getTransaction() != null && batchContainer.isSuspendTxAfterInvocation())
transactionManager.suspend();
Modified: trunk/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoader.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoader.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoader.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -91,7 +91,7 @@
}
private boolean isLocalCall() {
- InvocationContext invocationContext = cache.getInvocationContextContainer().getThreadContext();
+ InvocationContext invocationContext = cache.getInvocationContextContainer().getInvocationContext();
return invocationContext.isOriginLocal();
}
Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -372,7 +372,7 @@
// and roll back any tx and break any locks
// List<org.jgroups.Address> removed = toJGroupsAddressList(members);
// removed.removeAll(newMembers);
-// spi.getLocalInvocationContext().getOptionOverrides().setSkipCacheStatusCheck(true);
+// spi.createInvocationContext().getOptionOverrides().setSkipCacheStatusCheck(true);
// if (root != null)
// {
//removeLocksForDeadMembers(root.getDelegationTarget(), removed);
Modified: trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferManagerImpl.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferManagerImpl.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -218,7 +218,7 @@
private void processCommitLog(ObjectInput oi) throws Exception {
if (trace) log.trace("Applying commit log");
Object object = marshaller.objectFromObjectStream(oi);
- RemoteTxInvocationContext ctx = invocationContextContainer.getRemoteTxInvocationContext();
+ RemoteTxInvocationContext ctx = invocationContextContainer.createRemoteTxInvocationContext();
while (object instanceof TransactionLog.LogEntry) {
TransactionLog.LogEntry logEntry = (TransactionLog.LogEntry) object;
RemoteTransaction remoteTransaction = txTable.getRemoteTransaction(logEntry.getTransaction());
@@ -260,7 +260,7 @@
if (!transactionLog.hasPendingPrepare(command)) {
if (trace) log.trace("Applying pending prepare {0}", command);
commandsFactory.initializeReplicableCommand(command);
- RemoteTxInvocationContext ctx = invocationContextContainer.getRemoteTxInvocationContext();
+ RemoteTxInvocationContext ctx = invocationContextContainer.createRemoteTxInvocationContext();
RemoteTransaction transaction = txTable.createRemoteTransaction(command.getGlobalTransaction(), command.getModifications());
ctx.setRemoteTransaction(transaction);
ctx.setFlags(Flag.CACHE_MODE_LOCAL, Flag.SKIP_CACHE_STATUS_CHECK);
Modified: trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -80,7 +80,7 @@
PrepareCommand prepareCommand = commandsFactory.buildPrepareCommand(globalTx, modifications, configuration.isOnePhaseCommit());
if (trace) log.trace("Sending prepare command through the chain: " + prepareCommand);
- LocalTxInvocationContext ctx = icc.getLocalTxInvocationContext();
+ LocalTxInvocationContext ctx = icc.createTxInvocationContext();
ctx.setXaCache(this);
try {
invoker.invoke(ctx, prepareCommand);
@@ -94,7 +94,7 @@
public void commit(Xid xid, boolean b) throws XAException {
if (trace) log.trace("commiting TransactionXaAdapter: " + globalTx);
try {
- LocalTxInvocationContext ctx = icc.getLocalTxInvocationContext();
+ LocalTxInvocationContext ctx = icc.createTxInvocationContext();
ctx.setXaCache(this);
if (configuration.isOnePhaseCommit()) {
if (trace) log.trace("Doing an 1PC prepare call on the interceptor chain");
@@ -122,7 +122,7 @@
public void rollback(Xid xid) throws XAException {
RollbackCommand rollbackCommand = commandsFactory.buildRollbackCommand(globalTx);
- LocalTxInvocationContext ctx = icc.getLocalTxInvocationContext();
+ LocalTxInvocationContext ctx = icc.createTxInvocationContext();
ctx.setXaCache(this);
try {
invoker.invoke(ctx, rollbackCommand);
Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -75,7 +75,7 @@
* otherwise.
*/
protected final Object currentRequestor() {
- InvocationContext invocationContext = icc.getThreadContext();
+ InvocationContext invocationContext = icc.getInvocationContext();
Object o = invocationContext.getLockOwner();
return o;
}
Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/LockAssert.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/LockAssert.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/LockAssert.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -21,13 +21,13 @@
public static void assertNotLocked(Object key, InvocationContextContainer icc) {
// can't rely on the negative test since other entries may share the same lock with lock striping.
- assert !icc.getLocalInvocationContext().hasLockedKey(key) : key + " lock recorded!";
+ assert !icc.createInvocationContext().hasLockedKey(key) : key + " lock recorded!";
}
public static void assertNoLocks(LockManager lockManager, InvocationContextContainer icc) {
LockContainer lc = (LockContainer) TestingUtil.extractField(lockManager, "lockContainer");
assert lc.getNumLocksHeld() == 0 : "Stale locks exist! NumLocksHeld is " + lc.getNumLocksHeld() + " and lock info is " + lockManager.printLockInfo();
- InvocationContext invocationContext = icc.getThreadContext();
+ InvocationContext invocationContext = icc.getInvocationContext();
if (invocationContext instanceof TxInvocationContext) {
TxInvocationContext txContext = (TxInvocationContext) invocationContext;
int modCount = txContext.getModifications() == null ? 0 : txContext.getModifications().size();
Modified: trunk/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -73,10 +73,10 @@
AtomicMap<String, String> map = cache.getAtomicMap("key");
assert map.isEmpty();
InvocationContextContainer icc = TestingUtil.extractComponent(cache, InvocationContextContainer.class);
- InvocationContext ic = icc.getLocalInvocationContext();
+ InvocationContext ic = icc.createInvocationContext();
ic.setFlags(SKIP_LOCKING);
log.debug("Doing a put");
- assert icc.getThreadContext().hasFlag(SKIP_LOCKING);
+ assert icc.getInvocationContext().hasFlag(SKIP_LOCKING);
map.put("a", "b");
log.debug("Put complete");
assert map.get("a").equals("b");
@@ -89,7 +89,7 @@
AtomicMap<String, String> map = cache.getAtomicMap("key");
tm.begin();
assert map.isEmpty();
- TestingUtil.extractComponent(cache, InvocationContextContainer.class).getLocalInvocationContext().setFlags(SKIP_LOCKING);
+ TestingUtil.extractComponent(cache, InvocationContextContainer.class).createInvocationContext().setFlags(SKIP_LOCKING);
map.put("a", "b");
assert map.get("a").equals("b");
Transaction t = tm.suspend();
@@ -108,7 +108,7 @@
assert map.isEmpty();
map.put("x", "y");
assert map.get("x").equals("y");
- TestingUtil.extractComponent(cache, InvocationContextContainer.class).getLocalInvocationContext().setFlags(SKIP_LOCKING);
+ TestingUtil.extractComponent(cache, InvocationContextContainer.class).createInvocationContext().setFlags(SKIP_LOCKING);
log.debug("Doing a put");
map.put("a", "b");
log.debug("Put complete");
Modified: trunk/core/src/test/java/org/infinispan/test/AbstractCacheTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/AbstractCacheTest.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/test/java/org/infinispan/test/AbstractCacheTest.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -46,7 +46,7 @@
removeInMemoryData(cache);
clearCacheLoader(cache);
clearReplicationQueues(cache);
- InvocationContext invocationContext = ((AdvancedCache) cache).getInvocationContextContainer().getLocalInvocationContext();
+ InvocationContext invocationContext = ((AdvancedCache) cache).getInvocationContextContainer().createInvocationContext();
}
}
}
Modified: trunk/core/src/test/java/org/infinispan/test/TestingUtil.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/TestingUtil.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/core/src/test/java/org/infinispan/test/TestingUtil.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -523,7 +523,7 @@
ComponentRegistry cr = extractComponentRegistry(cache);
InterceptorChain ic = cr.getComponent(InterceptorChain.class);
InvocationContextContainer icc = cr.getComponent(InvocationContextContainer.class);
- InvocationContext ctxt = icc.getLocalInvocationContext();
+ InvocationContext ctxt = icc.createInvocationContext();
ic.invoke(ctxt, command);
}
Modified: trunk/tree/src/main/java/org/infinispan/tree/NodeImpl.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/NodeImpl.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/tree/src/main/java/org/infinispan/tree/NodeImpl.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -59,7 +59,7 @@
}
public Node<K, V> getParent(Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return getParent();
}
@@ -79,7 +79,7 @@
}
public Set<Node<K, V>> getChildren(Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return getChildren();
}
@@ -88,7 +88,7 @@
}
public Set<Object> getChildrenNames(Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return getChildrenNames();
}
@@ -98,7 +98,7 @@
}
public Map<K, V> getData(Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return getData();
}
@@ -113,7 +113,7 @@
}
public Set<K> getKeys(Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return getKeys();
}
@@ -141,7 +141,7 @@
}
public Node<K, V> addChild(Fqn f, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return addChild(f);
}
@@ -150,7 +150,7 @@
}
public boolean removeChild(Fqn f, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return removeChild(f);
}
@@ -176,7 +176,7 @@
}
public boolean removeChild(Object childName, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return removeChild(childName);
}
@@ -194,7 +194,7 @@
}
public Node<K, V> getChild(Fqn f, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return getChild(f);
}
@@ -212,7 +212,7 @@
}
public Node<K, V> getChild(Object name, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return getChild(name);
}
@@ -228,7 +228,7 @@
}
public V put(K key, V value, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return put(key, value);
}
@@ -246,7 +246,7 @@
}
public V putIfAbsent(K key, V value, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return putIfAbsent(key, value);
}
@@ -265,7 +265,7 @@
}
public V replace(K key, V value, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return replace(key, value);
}
@@ -286,7 +286,7 @@
}
public boolean replace(K key, V oldValue, V value, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return replace(key, oldValue, value);
}
@@ -301,7 +301,7 @@
}
public void putAll(Map<? extends K, ? extends V> map, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
putAll(map);
}
@@ -318,7 +318,7 @@
}
public void replaceAll(Map<? extends K, ? extends V> map, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
replaceAll(map);
}
@@ -327,7 +327,7 @@
}
public V get(K key, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return get(key);
}
@@ -342,7 +342,7 @@
}
public V remove(K key, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return remove(key);
}
@@ -351,7 +351,7 @@
}
public void clearData(Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
clearData();
}
@@ -360,7 +360,7 @@
}
public int dataSize(Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return dataSize();
}
@@ -375,7 +375,7 @@
}
public boolean hasChild(Fqn f, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return hasChild(f);
}
@@ -384,7 +384,7 @@
}
public boolean hasChild(Object o, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return hasChild(o);
}
@@ -404,7 +404,7 @@
}
public void removeChildren(Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
removeChildren();
}
Modified: trunk/tree/src/main/java/org/infinispan/tree/TreeCacheImpl.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/TreeCacheImpl.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/tree/src/main/java/org/infinispan/tree/TreeCacheImpl.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -52,7 +52,7 @@
}
public Node<K, V> getRoot(Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return getRoot();
}
@@ -61,7 +61,7 @@
}
public V put(String fqn, K key, V value, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return put(fqn, key, value);
}
@@ -76,7 +76,7 @@
}
public void put(Fqn fqn, Map<? extends K, ? extends V> data, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
put(fqn, data);
}
@@ -85,7 +85,7 @@
}
public void put(String fqn, Map<? extends K, ? extends V> data, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
put(fqn, data);
}
@@ -102,7 +102,7 @@
}
public V remove(Fqn fqn, K key, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return remove(fqn, key);
}
@@ -111,7 +111,7 @@
}
public V remove(String fqn, K key, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return remove(fqn, key);
}
@@ -132,7 +132,7 @@
}
public boolean removeNode(Fqn fqn, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return removeNode(fqn);
}
@@ -141,7 +141,7 @@
}
public boolean removeNode(String fqn, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return removeNode(fqn);
}
@@ -158,7 +158,7 @@
}
public Node<K, V> getNode(Fqn fqn, Flag... flags) {
- icc.getThreadContext().setFlags(flags);
+ icc.getInvocationContext().setFlags(flags);
return getNode(fqn);
}
@@ -167,7 +167,7 @@
}
public Node<K, V> getNode(String fqn, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return getNode(fqn);
}
@@ -179,7 +179,7 @@
}
public V get(Fqn fqn, K key, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return get(fqn, key);
}
@@ -188,12 +188,12 @@
}
public boolean exists(String fqn, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return exists(fqn);
}
public boolean exists(Fqn fqn, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return exists(fqn);
}
@@ -202,7 +202,7 @@
}
public V get(String fqn, K key, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return get(fqn, key);
}
@@ -251,7 +251,7 @@
}
public void move(Fqn nodeToMove, Fqn newParent, Flag... flags) throws NodeNotExistsException {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
move(nodeToMove, newParent);
}
@@ -260,7 +260,7 @@
}
public void move(String nodeToMove, String newParent, Flag... flags) throws NodeNotExistsException {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
move(nodeToMove, newParent);
}
@@ -275,7 +275,7 @@
}
public Map<K, V> getData(Fqn fqn, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return getData(fqn);
}
@@ -284,7 +284,7 @@
}
public Set<K> getKeys(String fqn, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return getKeys(fqn);
}
@@ -299,7 +299,7 @@
}
public Set<K> getKeys(Fqn fqn, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return getKeys(fqn);
}
@@ -308,7 +308,7 @@
}
public void clearData(String fqn, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
}
public void clearData(Fqn fqn) {
@@ -322,7 +322,7 @@
}
public void clearData(Fqn fqn, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
}
@SuppressWarnings("unchecked")
@@ -340,7 +340,7 @@
}
public V put(Fqn fqn, K key, V value, Flag... flags) {
- icc.getLocalInvocationContext().setFlags(flags);
+ icc.createInvocationContext().setFlags(flags);
return put(fqn, key, value);
}
Modified: trunk/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java 2009-05-13 11:04:06 UTC (rev 280)
+++ trunk/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java 2009-05-13 13:58:20 UTC (rev 281)
@@ -69,7 +69,7 @@
if (!exists(parent)) createNodeInCache(parent);
AtomicMap<Object, Fqn> parentStructure = getStructure(parent);
// don't lock parents for child insert/removes!
- icc.getThreadContext().setFlags(Flag.SKIP_LOCKING);
+ icc.getInvocationContext().setFlags(Flag.SKIP_LOCKING);
parentStructure.put(fqn.getLastElement(), fqn);
}
cache.getAtomicMap(structureKey);
More information about the infinispan-commits
mailing list