[jbosscache-commits] JBoss Cache SVN: r4761 - in core/trunk/src: test/java/org/jboss/cache/statetransfer and 1 other directory.
Author: manik.surtani(a)jboss.com
Date: 2007-11-15 11:56:39 -0500 (Thu, 15 Nov 2007)
New Revision: 4761
Modified:
core/trunk/src/main/java/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java
core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java
Log:
Stuff
Modified:
core/trunk/src/main/java/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java
===================================================================
---
core/trunk/src/main/java/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java 2007-11-15
16:19:11 UTC (rev 4760)
+++
core/trunk/src/main/java/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java 2007-11-15
16:56:39 UTC (rev 4761)
@@ -203,6 +203,7 @@
ctx.setOriginLocal(false);
getCache().getNotifier().notifyNodeCreated(curr.getFqn(), true, ctx);
getCache().getNotifier().notifyNodeCreated(curr.getFqn(), false, ctx);
+ // AND notify that they have been modified!!
if (!curr.getKeysDirect().isEmpty())
{
getCache().getNotifier().notifyNodeModified(curr.getFqn(), true,
NodeModifiedEvent.ModificationType.PUT_MAP, Collections.emptyMap(), ctx);
@@ -210,13 +211,6 @@
}
ctx.setOriginLocal(true);
- // Make sure any eviction policy is aware of this node
- RegionManager rm = cache.getRegionManager();
- Region region = null;
- region = rm.getRegion(curr.getFqn(), Region.Type.EVICTION, false);
- if (region != null) region.putNodeEvent(new EvictedEventNode(curr.getFqn(),
NodeEventType.ADD_NODE_EVENT, curr.getKeysDirect().size()));
-
- // AND notify that they have been modified!!
Set<NodeSPI> children = curr.getChildrenDirect();
for (NodeSPI n : children)
{
Modified:
core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java 2007-11-15
16:19:11 UTC (rev 4760)
+++
core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java 2007-11-15
16:56:39 UTC (rev 4761)
@@ -481,7 +481,14 @@
Region region = cache2.getRegion(Fqn.ROOT, false);
// We expect events for /a, /a/b and /a/b/c
- assertEquals("Saw the expected number of node events", 3,
region.nodeEventQueueSize());
+ int nodeEventQueueSize = region.nodeEventQueueSize();
+ int i=0;
+ while (region.nodeEventQueueSize() > 0)
+ {
+ System.out.println(++i+") Queue contains : " +
region.takeLastEventNode());
+ }
+
+ assertEquals("Saw the expected number of node events", 3,
nodeEventQueueSize);
}
/**