[jboss-cvs] JBossCache/src/org/jboss/cache/interceptors ...
Manik Surtani
msurtani at jboss.com
Tue Jan 2 12:15:29 EST 2007
User: msurtani
Date: 07/01/02 12:15:29
Modified: src/org/jboss/cache/interceptors
BaseRpcInterceptor.java
CreateIfNotExistsInterceptor.java
DataGravitatorInterceptor.java
BaseCacheLoaderInterceptor.java
CacheMgmtInterceptor.java
OptimisticCreateIfNotExistsInterceptor.java
PassivationInterceptor.java
Log:
some api changes
Revision Changes Path
1.20 +4 -4 JBossCache/src/org/jboss/cache/interceptors/BaseRpcInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BaseRpcInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/BaseRpcInterceptor.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- BaseRpcInterceptor.java 30 Aug 2006 17:08:18 -0000 1.19
+++ BaseRpcInterceptor.java 2 Jan 2007 17:15:29 -0000 1.20
@@ -67,7 +67,7 @@
if (log.isTraceEnabled()) log.trace("Broadcasting call " + call + " to recipient list " + recipients);
- if (!sync && cache.getReplQueue() != null && !usingBuddyReplication)
+ if (!sync && cache.getRPCManager().getReplicationQueue() != null && !usingBuddyReplication)
{
putCallOnAsyncReplicationQueue(call);
}
@@ -99,7 +99,7 @@
protected void putCallOnAsyncReplicationQueue(MethodCall call)
{
if (log.isDebugEnabled()) log.debug("Putting call " + call + " on the replication queue.");
- cache.getReplQueue().add(MethodCallFactory.create(MethodDeclarations.replicateMethod, call));
+ cache.getRPCManager().getReplicationQueue().add(MethodCallFactory.create(MethodDeclarations.replicateMethod, call));
}
protected boolean containsModifications(MethodCall m)
@@ -113,7 +113,7 @@
case MethodDeclarations.commitMethod_id:
case MethodDeclarations.rollbackMethod_id:
return cache.getInvocationContext().isTxHasMods();
- default :
+ default:
return false;
}
}
1.22 +3 -2 JBossCache/src/org/jboss/cache/interceptors/CreateIfNotExistsInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CreateIfNotExistsInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CreateIfNotExistsInterceptor.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- CreateIfNotExistsInterceptor.java 30 Dec 2006 17:49:53 -0000 1.21
+++ CreateIfNotExistsInterceptor.java 2 Jan 2007 17:15:29 -0000 1.22
@@ -1,6 +1,7 @@
package org.jboss.cache.interceptors;
import org.jboss.cache.CacheException;
+import org.jboss.cache.CacheImpl;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.GlobalTransaction;
@@ -18,7 +19,7 @@
* (depending on the create_if_not_exists argument)
*
* @author Bela Ban
- * @version $Id: CreateIfNotExistsInterceptor.java,v 1.21 2006/12/30 17:49:53 msurtani Exp $
+ * @version $Id: CreateIfNotExistsInterceptor.java,v 1.22 2007/01/02 17:15:29 msurtani Exp $
* @deprecated This code is not used anymore and will be removed in a future unlock
*/
public class CreateIfNotExistsInterceptor extends Interceptor
@@ -368,7 +369,7 @@
{
MethodCall undo_op = MethodCallFactory.create(MethodDeclarations.removeNodeMethodLocal,
tx, tmp_fqn, false);
- cache.addUndoOperation(tx, undo_op);
+ ((CacheImpl) cache).addUndoOperation(tx, undo_op);
// add the node name to the list maintained for the current tx
// (needed for abort/rollback of transaction)
1.33 +0 -0 JBossCache/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
1.8 +63 -63 JBossCache/src/org/jboss/cache/interceptors/BaseCacheLoaderInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BaseCacheLoaderInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/BaseCacheLoaderInterceptor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- BaseCacheLoaderInterceptor.java 21 Nov 2006 08:57:02 -0000 1.7
+++ BaseCacheLoaderInterceptor.java 2 Jan 2007 17:15:29 -0000 1.8
@@ -28,7 +28,7 @@
public void setCache(CacheSPI cache)
{
super.setCache(cache);
- this.loader = cache.getCacheLoader();
+ this.loader = cache.getCacheLoaderManager().getCacheLoader();
}
/**
@@ -40,7 +40,7 @@
{
Thread current = Thread.currentThread();
- synchronized(this)
+ synchronized (this)
{
while (lockMap.containsKey(lock) && !lockMap.get(lock).equals(current))
{
1.26 +2 -2 JBossCache/src/org/jboss/cache/interceptors/CacheMgmtInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheMgmtInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CacheMgmtInterceptor.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- CacheMgmtInterceptor.java 30 Dec 2006 17:49:53 -0000 1.25
+++ CacheMgmtInterceptor.java 2 Jan 2007 17:15:29 -0000 1.26
@@ -43,7 +43,7 @@
* Captures cache management statistics
*
* @author Jerry Gauthier
- * @version $Id: CacheMgmtInterceptor.java,v 1.25 2006/12/30 17:49:53 msurtani Exp $
+ * @version $Id: CacheMgmtInterceptor.java,v 1.26 2007/01/02 17:15:29 msurtani Exp $
*/
public class CacheMgmtInterceptor extends Interceptor implements CacheMgmtInterceptorMBean, NotificationBroadcaster
{
@@ -396,7 +396,7 @@
m_broadcaster.sendNotification(n);
}
- public void nodeMoved(Fqn from, Fqn to, boolean pre)
+ public void nodeMoved(Fqn from, Fqn to, boolean pre, boolean isLocal)
{
Notification n = new Notification(NOTIF_NODE_MOVED, this, seq(), MSG_NODE_MOVED);
n.setUserData(new Object[]{from.toString(), to.toString(), pre});
1.36 +1 -1 JBossCache/src/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OptimisticCreateIfNotExistsInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- OptimisticCreateIfNotExistsInterceptor.java 2 Jan 2007 14:37:14 -0000 1.35
+++ OptimisticCreateIfNotExistsInterceptor.java 2 Jan 2007 17:15:29 -0000 1.36
@@ -186,7 +186,7 @@
versionToPassIn = version;
}
- Node tempNode = workspaceNode.createChild(childName, copy, workspaceNode.getNode(), cache, versionToPassIn);
+ Node tempNode = workspaceNode.createChild(childName, workspaceNode.getNode(), cache, versionToPassIn);
childWorkspaceNode = NodeFactory.getInstance().createWorkspaceNode(tempNode, workspace);
childWorkspaceNode.setVersioningImplicit(versionToPassIn == null || !isTargetFqn);
1.36 +2 -2 JBossCache/src/org/jboss/cache/interceptors/PassivationInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PassivationInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/PassivationInterceptor.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- PassivationInterceptor.java 30 Dec 2006 17:49:54 -0000 1.35
+++ PassivationInterceptor.java 2 Jan 2007 17:15:29 -0000 1.36
@@ -16,7 +16,7 @@
* CacheLoader, either before each method call (no TXs), or at TX commit.
*
* @author <a href="mailto:{hmesha at novell.com}">{Hany Mesha}</a>
- * @version $Id: PassivationInterceptor.java,v 1.35 2006/12/30 17:49:54 msurtani Exp $
+ * @version $Id: PassivationInterceptor.java,v 1.36 2007/01/02 17:15:29 msurtani Exp $
*/
public class PassivationInterceptor extends Interceptor implements PassivationInterceptorMBean
{
@@ -27,7 +27,7 @@
public synchronized void setCache(CacheSPI cache)
{
super.setCache(cache);
- this.loader = cache.getCacheLoader();
+ this.loader = cache.getCacheLoaderManager().getCacheLoader();
}
/**
More information about the jboss-cvs-commits
mailing list