[jbosscache-commits] JBoss Cache SVN: r6279 - in core/trunk/src/main/java/org/jboss/cache: mvcc and 1 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Tue Jul 15 13:12:03 EDT 2008
Author: manik.surtani at jboss.com
Date: 2008-07-15 13:12:03 -0400 (Tue, 15 Jul 2008)
New Revision: 6279
Modified:
core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationContext.java
core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationDelegate.java
core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java
core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java
core/trunk/src/main/java/org/jboss/cache/mvcc/RepeatableReadNode.java
core/trunk/src/main/java/org/jboss/cache/transaction/PessimisticTransactionContext.java
Log:
Optimised logging and defensive copy of contextual locks
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationContext.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationContext.java 2008-07-15 16:39:43 UTC (rev 6278)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationContext.java 2008-07-15 17:12:03 UTC (rev 6279)
@@ -52,7 +52,7 @@
* This needs to be unchecked since we support both MVCC (Fqns held here) or legacy Opt/Pess locking (NodeLocks held here).
* once we drop support for opt/pess locks we can genericise this to contain Fqns. - Manik Surtani, June 2008
*/
- private LinkedHashSet invocationLocks;
+ protected LinkedHashSet invocationLocks;
public void setLocalRollbackOnly(boolean localRollbackOnly)
{
@@ -118,7 +118,7 @@
{
// first check transactional scope
if (transactionContext != null) return transactionContext.getLocks();
- return invocationLocks == null ? Collections.emptyList() : Collections.unmodifiableList(new ArrayList(invocationLocks));
+ return invocationLocks == null || invocationLocks.isEmpty() ? Collections.emptyList() : Collections.unmodifiableList(new ArrayList(invocationLocks));
}
@SuppressWarnings("unchecked")
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationDelegate.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationDelegate.java 2008-07-15 16:39:43 UTC (rev 6278)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationDelegate.java 2008-07-15 17:12:03 UTC (rev 6279)
@@ -1,7 +1,5 @@
package org.jboss.cache.invocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.ComponentRegistry;
import org.jboss.cache.factories.annotations.Inject;
@@ -19,8 +17,6 @@
*/
public abstract class AbstractInvocationDelegate
{
- protected final Log log = LogFactory.getLog(getClass());
- protected final boolean trace = log.isTraceEnabled();
protected Configuration configuration;
protected InvocationContextContainer invocationContextContainer;
protected ComponentRegistry componentRegistry;
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-07-15 16:39:43 UTC (rev 6278)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-07-15 17:12:03 UTC (rev 6279)
@@ -1,5 +1,7 @@
package org.jboss.cache.invocation;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.cache.CacheException;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.CacheStatus;
@@ -58,6 +60,8 @@
@NonVolatile
public class CacheInvocationDelegate<K, V> extends AbstractInvocationDelegate implements CacheSPI<K, V>
{
+ private static final Log log = LogFactory.getLog(CacheInvocationDelegate.class);
+
// this stuff is needed since the SPI has methods to retrieve these.
private StateTransferManager stateTransferManager;
private CacheLoaderManager cacheLoaderManager;
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java 2008-07-15 16:39:43 UTC (rev 6278)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java 2008-07-15 17:12:03 UTC (rev 6279)
@@ -1,5 +1,7 @@
package org.jboss.cache.invocation;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.cache.CacheException;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
@@ -26,6 +28,9 @@
*/
public class NodeInvocationDelegate<K, V> extends AbstractInvocationDelegate implements NodeSPI<K, V>
{
+ private static final Log log = LogFactory.getLog(NodeInvocationDelegate.class);
+ private static final boolean trace = log.isTraceEnabled();
+
protected volatile InternalNode<K, V> node;
private CacheSPI<K, V> spi;
Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java 2008-07-15 16:39:43 UTC (rev 6278)
+++ core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java 2008-07-15 17:12:03 UTC (rev 6279)
@@ -1,5 +1,7 @@
package org.jboss.cache.mvcc;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.cache.DataContainer;
import org.jboss.cache.Fqn;
import org.jboss.cache.InternalNode;
@@ -17,6 +19,9 @@
*/
public class ReadCommittedNode extends NodeInvocationDelegate
{
+ private static final Log log = LogFactory.getLog(ReadCommittedNode.class);
+ private static final boolean trace = log.isTraceEnabled();
+
protected volatile InternalNode backup;
protected boolean changed;
protected boolean created;
Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/RepeatableReadNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/mvcc/RepeatableReadNode.java 2008-07-15 16:39:43 UTC (rev 6278)
+++ core/trunk/src/main/java/org/jboss/cache/mvcc/RepeatableReadNode.java 2008-07-15 17:12:03 UTC (rev 6279)
@@ -1,5 +1,7 @@
package org.jboss.cache.mvcc;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.cache.DataContainer;
import org.jboss.cache.Fqn;
import org.jboss.cache.InternalNode;
@@ -17,6 +19,8 @@
*/
public class RepeatableReadNode extends ReadCommittedNode
{
+ private static final Log log = LogFactory.getLog(RepeatableReadNode.class);
+
public RepeatableReadNode(InternalNode node)
{
super(node);
Modified: core/trunk/src/main/java/org/jboss/cache/transaction/PessimisticTransactionContext.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/transaction/PessimisticTransactionContext.java 2008-07-15 16:39:43 UTC (rev 6278)
+++ core/trunk/src/main/java/org/jboss/cache/transaction/PessimisticTransactionContext.java 2008-07-15 17:12:03 UTC (rev 6279)
@@ -170,7 +170,7 @@
@SuppressWarnings("unchecked")
public List getLocks()
{
- return transactionLocks == null ? Collections.emptyList() : Collections.unmodifiableList(new ArrayList(transactionLocks));
+ return transactionLocks == null || transactionLocks.isEmpty() ? Collections.emptyList() : Collections.unmodifiableList(new ArrayList(transactionLocks));
}
More information about the jbosscache-commits
mailing list