[jboss-cvs] JBossCache/src/org/jboss/cache ...
Manik Surtani
manik at jboss.org
Fri Jun 8 11:39:29 EDT 2007
User: msurtani
Date: 07/06/08 11:39:29
Modified: src/org/jboss/cache CacheImpl.java UnversionedNode.java
Log:
JBCACHE-1022
Revision Changes Path
1.84 +23 -23 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.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- CacheImpl.java 6 Jun 2007 17:47:49 -0000 1.83
+++ CacheImpl.java 8 Jun 2007 15:39:29 -0000 1.84
@@ -804,7 +804,7 @@
regionManager.startEvictionThread();
}
- notifier.notifyCacheStarted(this, getInvocationContext(), true);
+ notifier.notifyCacheStarted(this, getInvocationContext());
// install a VM shutdown hook
Thread shutdownHook = new Thread()
@@ -970,7 +970,7 @@
if (notifier != null)
{
- notifier.notifyCacheStopped(this, getInvocationContext(), true);
+ notifier.notifyCacheStopped(this, getInvocationContext());
notifier.removeAllCacheListeners();
notifier.setEvictionPolicyListener(null);
}
@@ -1411,14 +1411,14 @@
log.trace(new StringBuffer("_get(").append("\"").append(fqn).append("\", \"").append(key).append("\", \"").
append(sendNodeEvent).append("\")"));
}
- if (sendNodeEvent) notifier.notifyNodeVisited(fqn, true, ctx, true);
+ if (sendNodeEvent) notifier.notifyNodeVisited(fqn, true, ctx);
NodeSPI<K, V> n = findNode(fqn);
if (n == null)
{
log.trace("node not found");
return null;
}
- if (sendNodeEvent) notifier.notifyNodeVisited(fqn, false, ctx, true);
+ if (sendNodeEvent) notifier.notifyNodeVisited(fqn, false, ctx);
return n.getDirect(key);
}
@@ -2265,7 +2265,7 @@
InvocationContext ctx = getInvocationContext();
NodeSPI<K, V> n = findNodeCheck(tx, fqn);
Map<K, V> rawData = n.getDataDirect();
- notifier.notifyNodeModified(fqn, true, CacheListener.ModificationType.PUT_MAP, rawData, ctx, true);
+ notifier.notifyNodeModified(fqn, true, CacheListener.ModificationType.PUT_MAP, rawData, ctx);
// create a compensating method call (reverting the effect of
// this modification) and put it into the TX's undo list.
@@ -2280,7 +2280,7 @@
n.clearDataDirect();
n.putAllDirect(data);
- notifier.notifyNodeModified(fqn, false, CacheListener.ModificationType.PUT_MAP, n.getDataDirect(), ctx, true);
+ notifier.notifyNodeModified(fqn, false, CacheListener.ModificationType.PUT_MAP, n.getDataDirect(), ctx);
}
@@ -2317,7 +2317,7 @@
InvocationContext ctx = getInvocationContext();
NodeSPI<K, V> n = findNodeCheck(tx, fqn);
Map<K, V> rawData = n.getDataDirect();
- notifier.notifyNodeModified(fqn, true, CacheListener.ModificationType.PUT_DATA, rawData, ctx, true);
+ notifier.notifyNodeModified(fqn, true, CacheListener.ModificationType.PUT_DATA, rawData, ctx);
V old_value = n.putDirect(key, value);
@@ -2339,7 +2339,7 @@
}
Map<K, V> newData = Collections.singletonMap(key, value);
- notifier.notifyNodeModified(fqn, false, CacheListener.ModificationType.PUT_DATA, newData, ctx, true);
+ notifier.notifyNodeModified(fqn, false, CacheListener.ModificationType.PUT_DATA, newData, ctx);
return old_value;
}
@@ -2438,11 +2438,11 @@
if (eviction)
{
- notifier.notifyNodeEvicted(fqn, true, ctx, true);
+ notifier.notifyNodeEvicted(fqn, true, ctx);
}
else
{
- notifier.notifyNodeRemoved(fqn, true, n.getDataDirect(), ctx, true);
+ notifier.notifyNodeRemoved(fqn, true, n.getDataDirect(), ctx);
}
parent_node = n.getParent();
@@ -2480,11 +2480,11 @@
if (eviction)
{
- notifier.notifyNodeEvicted(fqn, false, ctx, true);
+ notifier.notifyNodeEvicted(fqn, false, ctx);
}
else
{
- notifier.notifyNodeRemoved(fqn, false, null, ctx, true);
+ notifier.notifyNodeRemoved(fqn, false, null, ctx);
}
return found;
@@ -2530,7 +2530,7 @@
return null;
}
InvocationContext ctx = getInvocationContext();
- notifier.notifyNodeModified(fqn, true, CacheListener.ModificationType.REMOVE_DATA, n.getDataDirect(), ctx, true);
+ notifier.notifyNodeModified(fqn, true, CacheListener.ModificationType.REMOVE_DATA, n.getDataDirect(), ctx);
old_value = n.removeDirect(key);
@@ -2544,7 +2544,7 @@
}
Map<K, V> removedData = Collections.singletonMap(key, old_value);
- notifier.notifyNodeModified(fqn, false, CacheListener.ModificationType.REMOVE_DATA, removedData, ctx, true);
+ notifier.notifyNodeModified(fqn, false, CacheListener.ModificationType.REMOVE_DATA, removedData, ctx);
return old_value;
}
@@ -2622,11 +2622,11 @@
if (eviction)
{
- notifier.notifyNodeEvicted(fqn, true, ctx, true);
+ notifier.notifyNodeEvicted(fqn, true, ctx);
}
else
{
- notifier.notifyNodeModified(fqn, true, CacheListener.ModificationType.REMOVE_DATA, data, ctx, true);
+ notifier.notifyNodeModified(fqn, true, CacheListener.ModificationType.REMOVE_DATA, data, ctx);
}
n.clearDataDirect();
@@ -2637,17 +2637,17 @@
if (sendNodeEvent)
{
- notifier.notifyNodeVisited(fqn, false, ctx, true);
+ notifier.notifyNodeVisited(fqn, false, ctx);
}
else
{// FIXME Bela did this so GUI view can refresh the view after node is evicted. But this breaks eviction policy, especially AOP!!!!
if (eviction)
{
- notifier.notifyNodeEvicted(fqn, false, ctx, true);
+ notifier.notifyNodeEvicted(fqn, false, ctx);
}
else
{
- notifier.notifyNodeModified(fqn, false, CacheListener.ModificationType.REMOVE_DATA, data, ctx, true);
+ notifier.notifyNodeModified(fqn, false, CacheListener.ModificationType.REMOVE_DATA, data, ctx);
}
}
@@ -2766,7 +2766,7 @@
}
InvocationContext ctx = getInvocationContext();
Fqn fqn = new Fqn(parent_fqn, child_name);
- notifier.notifyNodeCreated(fqn, true, ctx, true);
+ notifier.notifyNodeCreated(fqn, true, ctx);
parentNode.addChild(child_name, childNode);
childNode.markAsDeleted(false, true);
@@ -2777,7 +2777,7 @@
tx_table.addUndoOperation(gtx, MethodCallFactory.create(MethodDeclarations.removeNodeMethodLocal, gtx, fqn, false));
}
- notifier.notifyNodeCreated(fqn, false, ctx, true);
+ notifier.notifyNodeCreated(fqn, false, ctx);
}
@@ -3211,12 +3211,12 @@
// parent pointer is calculated on the fly using Fqns.
// notify
- notifier.notifyNodeMoved(nodeToMoveFqn, new Fqn(newParentFqn, nodeToMoveFqn.getLastElement()), true, ctx, true);
+ notifier.notifyNodeMoved(nodeToMoveFqn, new Fqn(newParentFqn, nodeToMoveFqn.getLastElement()), true, ctx);
// now adjust Fqns of node and all children.
moveFqns(node, newParent.getFqn());
- notifier.notifyNodeMoved(nodeToMoveFqn, new Fqn(newParentFqn, nodeToMoveFqn.getLastElement()), false, ctx, true);
+ notifier.notifyNodeMoved(nodeToMoveFqn, new Fqn(newParentFqn, nodeToMoveFqn.getLastElement()), false, ctx);
// now register an undo op
if (ctx.getTransaction() != null)
1.29 +3 -3 JBossCache/src/org/jboss/cache/UnversionedNode.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UnversionedNode.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/UnversionedNode.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- UnversionedNode.java 23 May 2007 15:22:05 -0000 1.28
+++ UnversionedNode.java 8 Jun 2007 15:39:29 -0000 1.29
@@ -251,7 +251,7 @@
child = (NodeSPI) children().get(child_name);
if (child == null)
{
- cache.getNotifier().notifyNodeCreated(child_fqn, true, ctx, true);
+ cache.getNotifier().notifyNodeCreated(child_fqn, true, ctx);
child = newChild;
children.put(child_name, child);
if (gtx != null)
@@ -273,7 +273,7 @@
{
log.trace("created child: fqn=" + child_fqn);
}
- cache.getNotifier().notifyNodeCreated(child_fqn, false, ctx, true);
+ cache.getNotifier().notifyNodeCreated(child_fqn, false, ctx);
}
}
return child;
More information about the jboss-cvs-commits
mailing list