JBoss Cache SVN: r5612 - in core/trunk/src: main/java/org/jboss/cache/transaction and 2 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-21 19:39:34 -0400 (Mon, 21 Apr 2008)
New Revision: 5612
Modified:
core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java
core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java
Log:
Fixed various issues
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-04-21 23:17:47 UTC (rev 5611)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-04-21 23:39:34 UTC (rev 5612)
@@ -87,7 +87,7 @@
{
GlobalTransaction gtx = getGlobalTransaction(ctx);
TransactionWorkspace workspace = getTransactionWorkspace(gtx);
- WorkspaceNode workspaceNode = fetchWorkspaceNode(ctx, command.getFqn(), workspace, true, true);
+ WorkspaceNode workspaceNode = fetchWorkspaceNode(ctx, command.getFqn(), workspace, false, true);
if (workspaceNode != null)
{
setVersioning(ctx, workspace, workspaceNode);
@@ -464,7 +464,7 @@
if (workspaceNode == null) return false;
Fqn parentFqn = workspaceNode.getFqn().getParent();
- WorkspaceNode parentNode = fetchWorkspaceNode(ctx, parentFqn, workspace, true, true);
+ WorkspaceNode parentNode = fetchWorkspaceNode(ctx, parentFqn, workspace, false, true);
if (parentNode == null) throw new NodeNotExistsException("Unable to find parent node with fqn " + parentFqn);
// pre-notify
@@ -567,9 +567,9 @@
if (trace) log.trace("Node " + fqn + " has been deleted in the workspace.");
if (undeleteIfNecessary)
{
- undeleteWorkspaceNode(workspaceNode, fetchWorkspaceNode(ctx, fqn.getParent(), workspace, true, includeInvalidNodes));
+ undeleteWorkspaceNode(workspaceNode, fetchWorkspaceNode(ctx, fqn.getParent(), workspace, undeleteIfNecessary, includeInvalidNodes));
}
- else
+ else if (!includeInvalidNodes)
{
// don't return deleted nodes if undeleteIfNecessary is false!
workspaceNode = null;
Modified: core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java 2008-04-21 23:17:47 UTC (rev 5611)
+++ core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java 2008-04-21 23:39:34 UTC (rev 5612)
@@ -246,6 +246,8 @@
log.trace("releasing lock for " + lock.getFqn() + " (" + lock + ")");
}
}
+
+ locks.clear();
}
}
Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java 2008-04-21 23:17:47 UTC (rev 5611)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java 2008-04-21 23:39:34 UTC (rev 5612)
@@ -375,8 +375,7 @@
tm.begin();
assertEquals(cache.get("/foo/1/2/3", "item"), 1);
cache.removeNode("/foo/1");
- cache.exists("/foo/1");
- assertFalse(cache.exists("/foo/1"));
+ assertNull(cache.getNode("/foo/1"));
assertNull(cache.get("/foo/1", "item"));
cache.removeNode("/foo/1/2/3");
assertNull(cache.get("/foo/1/2/3", "item"));
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java 2008-04-21 23:17:47 UTC (rev 5611)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java 2008-04-21 23:39:34 UTC (rev 5612)
@@ -2,6 +2,7 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.commands.tx.CommitCommand;
import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor;
import org.jboss.cache.interceptors.OptimisticNodeInterceptor;
import org.jboss.cache.interceptors.base.ChainedInterceptor;
@@ -85,7 +86,7 @@
assertTrue(entry.getLocks().isEmpty());
assertEquals(0, entry.getModifications().size());
assertTrue(!cache.exists("/one/two"));
- assertEquals(null, dummy.getCalledCommand());
+ assertEquals(CommitCommand.class, dummy.getCalledCommand().getClass());
}
public void testTransactionRemoveEmptyMethod() throws Exception
16 years, 2 months
JBoss Cache SVN: r5611 - core/trunk/src/test/java/org/jboss/cache/api.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-21 19:17:47 -0400 (Mon, 21 Apr 2008)
New Revision: 5611
Modified:
core/trunk/src/test/java/org/jboss/cache/api/NodeAPIOptimisticTest.java
Log:
Dont bother overriding
Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeAPIOptimisticTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/NodeAPIOptimisticTest.java 2008-04-21 23:15:43 UTC (rev 5610)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeAPIOptimisticTest.java 2008-04-21 23:17:47 UTC (rev 5611)
@@ -5,17 +5,11 @@
/**
* An optimistic version of {@link org.jboss.cache.api.NodeAPITest}
*/
-@Test(groups={"functional"})
+@Test(groups = "functional")
public class NodeAPIOptimisticTest extends NodeAPITest
{
public NodeAPIOptimisticTest()
{
optimistic = true;
}
-
- @Override
- public void testDoubleRemovalOfData() throws Exception
- {
- super.testDoubleRemovalOfData(); //To change body of overridden methods use File | Settings | File Templates.
- }
}
16 years, 2 months
JBoss Cache SVN: r5610 - core/branches/2.1.X/src/main/java/org/jboss/cache/interceptors.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-21 19:15:43 -0400 (Mon, 21 Apr 2008)
New Revision: 5610
Modified:
core/branches/2.1.X/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
Log:
Fixed JBCACHE-1329, double removal of nodes
Modified: core/branches/2.1.X/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
===================================================================
--- core/branches/2.1.X/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-04-21 23:15:00 UTC (rev 5609)
+++ core/branches/2.1.X/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-04-21 23:15:43 UTC (rev 5610)
@@ -338,7 +338,7 @@
if (workspaceNode == null) return false;
Fqn parentFqn = workspaceNode.getFqn().getParent();
- WorkspaceNode parentNode = fetchWorkspaceNode(ctx, parentFqn, workspace, true, true);
+ WorkspaceNode parentNode = fetchWorkspaceNode(ctx, parentFqn, workspace, false, true);
if (parentNode == null) throw new NodeNotExistsException("Unable to find parent node with fqn " + parentFqn);
// pre-notify
@@ -551,9 +551,9 @@
if (trace) log.trace("Node " + fqn + " has been deleted in the workspace.");
if (undeleteIfNecessary)
{
- undeleteWorkspaceNode(workspaceNode, fetchWorkspaceNode(ctx, fqn.getParent(), workspace, true, includeInvalidNodes));
+ undeleteWorkspaceNode(workspaceNode, fetchWorkspaceNode(ctx, fqn.getParent(), workspace, undeleteIfNecessary, includeInvalidNodes));
}
- else
+ else if (!includeInvalidNodes)
{
// don't return deleted nodes if undeleteIfNecessary is false!
workspaceNode = null;
16 years, 2 months
JBoss Cache SVN: r5609 - core/branches/2.1.X/src/test/resources.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-21 19:15:00 -0400 (Mon, 21 Apr 2008)
New Revision: 5609
Modified:
core/branches/2.1.X/src/test/resources/log4j.xml
Log:
Shippable log4j file
Modified: core/branches/2.1.X/src/test/resources/log4j.xml
===================================================================
--- core/branches/2.1.X/src/test/resources/log4j.xml 2008-04-21 16:53:38 UTC (rev 5608)
+++ core/branches/2.1.X/src/test/resources/log4j.xml 2008-04-21 23:15:00 UTC (rev 5609)
@@ -63,7 +63,7 @@
<!-- ================ -->
<category name="org.jboss.cache">
- <priority value="TRACE"/>
+ <priority value="WARN"/>
</category>
<category name="org.jboss.cache.factories">
@@ -83,8 +83,8 @@
<!-- ======================= -->
<root>
- <appender-ref ref="CONSOLE"/>
- <!--<appender-ref ref="FILE"/>-->
+ <!--<appender-ref ref="CONSOLE"/>-->
+ <appender-ref ref="FILE"/>
</root>
</log4j:configuration>
16 years, 2 months
JBoss Cache SVN: r5608 - core/trunk/src/test/java/org/jboss/cache/api.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-21 12:53:38 -0400 (Mon, 21 Apr 2008)
New Revision: 5608
Modified:
core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java
Log:
Added test
Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java 2008-04-21 16:53:13 UTC (rev 5607)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java 2008-04-21 16:53:38 UTC (rev 5608)
@@ -387,4 +387,18 @@
assertNull(cache.get("/foo/1", "item"));
}
+ public void testDoubleRemovalOfData2() throws Exception
+ {
+ cache.put("/foo/1/2", "item", 1);
+ tm.begin();
+ assertEquals(cache.get("/foo/1", "item"), null);
+ cache.removeNode("/foo/1");
+ assertNull(cache.get("/foo/1", "item"));
+ cache.removeNode("/foo/1/2");
+ assertNull(cache.get("/foo/1", "item"));
+ tm.commit();
+ assertFalse(cache.exists("/foo/1"));
+ assertNull(cache.get("/foo/1/2", "item"));
+ assertNull(cache.get("/foo/1", "item"));
+ }
}
16 years, 2 months
JBoss Cache SVN: r5607 - core/trunk/src/test/java/org/jboss/cache/buddyreplication.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-21 12:53:13 -0400 (Mon, 21 Apr 2008)
New Revision: 5607
Modified:
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyPoolBroadcastTest.java
Log:
Added test anotation
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyPoolBroadcastTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyPoolBroadcastTest.java 2008-04-21 16:52:06 UTC (rev 5606)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyPoolBroadcastTest.java 2008-04-21 16:53:13 UTC (rev 5607)
@@ -12,6 +12,7 @@
import org.jboss.cache.misc.TestingUtil;
import static org.testng.AssertJUnit.assertEquals;
import org.testng.annotations.AfterMethod;
+import org.testng.annotations.Test;
import java.util.ArrayList;
import java.util.List;
@@ -23,6 +24,7 @@
*
* @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
*/
+@Test(groups = "functional")
public class BuddyPoolBroadcastTest extends BuddyReplicationTestsBase
{
private Log log = LogFactory.getLog(BuddyPoolBroadcastTest.class);
16 years, 2 months
JBoss Cache SVN: r5606 - core/branches/2.1.X/src/test/java/org/jboss/cache/api.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-21 12:52:06 -0400 (Mon, 21 Apr 2008)
New Revision: 5606
Modified:
core/branches/2.1.X/src/test/java/org/jboss/cache/api/NodeAPITest.java
Log:
Added test
Modified: core/branches/2.1.X/src/test/java/org/jboss/cache/api/NodeAPITest.java
===================================================================
--- core/branches/2.1.X/src/test/java/org/jboss/cache/api/NodeAPITest.java 2008-04-21 16:39:44 UTC (rev 5605)
+++ core/branches/2.1.X/src/test/java/org/jboss/cache/api/NodeAPITest.java 2008-04-21 16:52:06 UTC (rev 5606)
@@ -387,17 +387,16 @@
public void testDoubleRemovalOfData2() throws Exception
{
- cache.put("/foo/1/2/3", "item", 1);
+ cache.put("/foo/1/2", "item", 1);
tm.begin();
- assertEquals(cache.get("/foo/1", "item"), 1);
+ assertEquals(cache.get("/foo/1", "item"), null);
cache.removeNode("/foo/1");
assertNull(cache.get("/foo/1", "item"));
- cache.removeNode("/foo/1/2/3");
- assertNull(cache.get("/foo/1/2/3", "item"));
+ cache.removeNode("/foo/1/2");
assertNull(cache.get("/foo/1", "item"));
tm.commit();
assertFalse(cache.exists("/foo/1"));
- assertNull(cache.get("/foo/1/2/3", "item"));
+ assertNull(cache.get("/foo/1/2", "item"));
assertNull(cache.get("/foo/1", "item"));
}
}
16 years, 2 months
JBoss Cache SVN: r5605 - core/branches/2.1.X/src/test/java/org/jboss/cache/api.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-21 12:39:44 -0400 (Mon, 21 Apr 2008)
New Revision: 5605
Modified:
core/branches/2.1.X/src/test/java/org/jboss/cache/api/NodeAPITest.java
Log:
Added test
Modified: core/branches/2.1.X/src/test/java/org/jboss/cache/api/NodeAPITest.java
===================================================================
--- core/branches/2.1.X/src/test/java/org/jboss/cache/api/NodeAPITest.java 2008-04-21 16:07:51 UTC (rev 5604)
+++ core/branches/2.1.X/src/test/java/org/jboss/cache/api/NodeAPITest.java 2008-04-21 16:39:44 UTC (rev 5605)
@@ -385,4 +385,19 @@
assertNull(cache.get("/foo/1", "item"));
}
+ public void testDoubleRemovalOfData2() throws Exception
+ {
+ cache.put("/foo/1/2/3", "item", 1);
+ tm.begin();
+ assertEquals(cache.get("/foo/1", "item"), 1);
+ cache.removeNode("/foo/1");
+ assertNull(cache.get("/foo/1", "item"));
+ cache.removeNode("/foo/1/2/3");
+ assertNull(cache.get("/foo/1/2/3", "item"));
+ assertNull(cache.get("/foo/1", "item"));
+ tm.commit();
+ assertFalse(cache.exists("/foo/1"));
+ assertNull(cache.get("/foo/1/2/3", "item"));
+ assertNull(cache.get("/foo/1", "item"));
+ }
}
16 years, 2 months
JBoss Cache SVN: r5604 - core/branches/2.1.X/src/main/java/org/jboss/cache/interceptors.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-21 12:07:51 -0400 (Mon, 21 Apr 2008)
New Revision: 5604
Modified:
core/branches/2.1.X/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
Log:
reduced logging noise
Modified: core/branches/2.1.X/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
===================================================================
--- core/branches/2.1.X/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2008-04-21 16:06:49 UTC (rev 5603)
+++ core/branches/2.1.X/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2008-04-21 16:07:51 UTC (rev 5604)
@@ -513,9 +513,9 @@
private MethodCall attachGlobalTransaction(InvocationContext ctx, Transaction tx, MethodCall m) throws Exception
{
- if (log.isDebugEnabled())
+ if (trace)
{
- log.debug(" local transaction exists - registering global tx if not present for " + Thread.currentThread());
+ log.trace(" local transaction exists - registering global tx if not present for " + Thread.currentThread());
}
if (trace)
{
@@ -906,7 +906,7 @@
{
log.trace(" running commit for " + gtx);
}
-
+
handleCommitRollback(ctx, commitMethod);
}
catch (Throwable e)
@@ -1080,11 +1080,11 @@
}
else if ((gtx = (GlobalTransaction) rollbackTransactions.get(tx)) != null)
{
- if (log.isDebugEnabled()) log.debug("Transaction " + tx + " is already registered and is rolling back.");
+ if (trace) log.trace("Transaction " + tx + " is already registered and is rolling back.");
}
else
{
- if (log.isDebugEnabled()) log.debug("Transaction " + tx + " is already registered.");
+ if (trace) log.trace("Transaction " + tx + " is already registered.");
}
return gtx;
16 years, 2 months
JBoss Cache SVN: r5603 - core/trunk/src/main/java/org/jboss/cache/interceptors.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-21 12:06:49 -0400 (Mon, 21 Apr 2008)
New Revision: 5603
Modified:
core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
Log:
Reduced logging noise
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2008-04-21 14:36:06 UTC (rev 5602)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2008-04-21 16:06:49 UTC (rev 5603)
@@ -492,9 +492,9 @@
private CacheCommand attachGlobalTransaction(InvocationContext ctx, Transaction tx, CacheCommand command) throws Throwable
{
- if (log.isDebugEnabled())
+ if (trace)
{
- log.debug(" local transaction exists - registering global tx if not present for " + Thread.currentThread());
+ log.trace(" local transaction exists - registering global tx if not present for " + Thread.currentThread());
}
if (trace)
{
@@ -937,11 +937,11 @@
}
else if ((gtx = (GlobalTransaction) rollbackTransactions.get(tx)) != null)
{
- if (log.isDebugEnabled()) log.debug("Transaction " + tx + " is already registered and is rolling back.");
+ if (trace) log.trace("Transaction " + tx + " is already registered and is rolling back.");
}
else
{
- if (log.isDebugEnabled()) log.debug("Transaction " + tx + " is already registered.");
+ if (trace) log.trace("Transaction " + tx + " is already registered.");
}
return gtx;
16 years, 2 months