[jboss-cvs] JBossCache/src/org/jboss/cache/transaction ...
Elias Ross
genman at noderunner.net
Tue Mar 6 14:18:20 EST 2007
User: genman
Date: 07/03/06 14:18:20
Modified: src/org/jboss/cache/transaction
BatchModeTransactionManager.java
GlobalTransaction.java TransactionEntry.java
Log:
Assign generic type arguments to collections
Revision Changes Path
1.5 +1 -2 JBossCache/src/org/jboss/cache/transaction/BatchModeTransactionManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BatchModeTransactionManager.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/transaction/BatchModeTransactionManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- BatchModeTransactionManager.java 18 Apr 2006 12:03:25 -0000 1.4
+++ BatchModeTransactionManager.java 6 Mar 2007 19:18:20 -0000 1.5
@@ -8,7 +8,7 @@
* transactional symantics of rollbacks and recovery are NOT used here. This is used by PojoCache.
*
* @author bela
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
* Date: May 15, 2003
* Time: 4:11:37 PM
*/
@@ -18,7 +18,6 @@
private static final long serialVersionUID = 5656602677430350961L;
public BatchModeTransactionManager() {
- ;
}
public static BatchModeTransactionManager getInstance() {
1.2 +3 -4 JBossCache/src/org/jboss/cache/transaction/GlobalTransaction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: GlobalTransaction.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/transaction/GlobalTransaction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- GlobalTransaction.java 7 Feb 2007 22:06:44 -0000 1.1
+++ GlobalTransaction.java 6 Mar 2007 19:18:20 -0000 1.2
@@ -22,7 +22,7 @@
*
* @author <a href="mailto:bela at jboss.org">Bela Ban</a> Apr 12, 2003
* @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class GlobalTransaction implements Externalizable
{
@@ -93,9 +93,8 @@
return false;
GlobalTransaction otherGtx = (GlobalTransaction) other;
-
- return ((addr == null && otherGtx.addr == null) || (addr != null && otherGtx.addr != null && addr.compareTo(otherGtx.addr) == 0)) &&
- id == otherGtx.id;
+ boolean aeq = (addr == null) ? (otherGtx.addr == null) : addr.equals(otherGtx.addr);
+ return aeq && (id == otherGtx.id);
}
public String toString()
1.4 +21 -21 JBossCache/src/org/jboss/cache/transaction/TransactionEntry.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TransactionEntry.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/transaction/TransactionEntry.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- TransactionEntry.java 5 Mar 2007 18:46:44 -0000 1.3
+++ TransactionEntry.java 6 Mar 2007 19:18:20 -0000 1.4
@@ -40,7 +40,7 @@
* </ul>
*
* @author <a href="mailto:bela at jboss.org">Bela Ban</a> Apr 14, 2003
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class TransactionEntry
{
@@ -65,7 +65,7 @@
* we have a corresponding entry in this list. A rollback will simply iterate over this list in
* reverse to undo the modifications. Note that these undo-ops will never be replicated.
*/
- private final List undo_list = new LinkedList();
+ private final List<MethodCall> undo_list = new LinkedList<MethodCall>();
/**
* LinkedHashSet<IdentityLock> of locks acquired by the transaction. We use
@@ -73,13 +73,13 @@
* be added multiple times) but also need guaranteed ordering for use
* by lock release code (see JBCCACHE-874).
*/
- private LinkedHashSet locks = new LinkedHashSet();
+ private LinkedHashSet<NodeLock> locks = new LinkedHashSet<NodeLock>();
/**
* A list of dummy uninitialised nodes created by the cache loader interceptor to load data for a
* given node in this tx.
*/
- private List dummyNodesCreatedByCacheLoader;
+ private List<Fqn> dummyNodesCreatedByCacheLoader;
/**
* List<Fqn> of nodes that have been removed by the transaction
@@ -108,7 +108,6 @@
if (m != null) cl_mod_list.add(m);
}
-
/**
* Returns all modifications.
*/
@@ -147,14 +146,14 @@
*/
public List<Fqn> getRemovedNodes()
{
- return new ArrayList(removedNodes);
+ return new ArrayList<Fqn>(removedNodes);
}
/**
* Returns the undo operations in use.
* Note: This list may be concurrently modified.
*/
- public List getUndoOperations()
+ public List<MethodCall> getUndoOperations()
{
return undo_list;
}
@@ -192,9 +191,9 @@
/**
* Add multiple locks to the lock list.
*
- * @param newLocks Collection<IdentityLock>
+ * @param newLocks Collection<NodeLock>
*/
- public void addLocks(Collection newLocks)
+ public void addLocks(Collection<NodeLock> newLocks)
{
if (newLocks != null)
{
@@ -210,11 +209,11 @@
*
* @return a defensive copy of the internal data structure.
*/
- public List getLocks()
+ public List<NodeLock> getLocks()
{
synchronized (locks)
{
- return new ArrayList(locks);
+ return new ArrayList<NodeLock>(locks);
}
}
@@ -239,14 +238,15 @@
public void releaseAllLocksLIFO(Object owner)
{
+ boolean trace = log.isTraceEnabled();
synchronized (locks)
{
// Copying out to an array is faster than creating an ArrayList and iterating,
// since list creation will just copy out to an array internally
- IdentityLock[] lockArray = (IdentityLock[]) locks.toArray(new IdentityLock[locks.size()]);
+ IdentityLock[] lockArray = locks.toArray(new IdentityLock[locks.size()]);
for (int i = lockArray.length - 1; i >= 0; i--)
{
- if (log.isTraceEnabled())
+ if (trace)
{
log.trace("releasing lock for " + lockArray[i].getFqn() + " (" + lockArray[i] + ")");
}
@@ -266,7 +266,7 @@
// This seems fairly safe though
synchronized (locks)
{
- for (Iterator i = locks.iterator(); i.hasNext();)
+ for (Iterator<NodeLock> i = locks.iterator(); i.hasNext();)
{
IdentityLock lock = (IdentityLock) i.next();
lock.release(owner);
@@ -287,14 +287,14 @@
{
log.trace("undoOperations " + undo_list);
}
- ArrayList l;
+ ArrayList<MethodCall> l;
synchronized (undo_list)
{
- l = new ArrayList(undo_list);
+ l = new ArrayList<MethodCall>(undo_list);
}
- for (ListIterator i = l.listIterator(l.size()); i.hasPrevious();)
+ for (ListIterator<MethodCall> i = l.listIterator(l.size()); i.hasPrevious();)
{
- MethodCall undo_op = (MethodCall) i.previous();
+ MethodCall undo_op = i.previous();
undo(undo_op, cache);
}
}
@@ -322,7 +322,7 @@
public String toString()
{
StringBuffer sb = new StringBuffer();
- sb.append("TransactionEntry:\nmodification_list: ").append(modification_list);
+ sb.append("TransactionEntry\nmodification_list: ").append(modification_list);
synchronized (undo_list)
{
sb.append("\nundo_list: ").append(undo_list);
@@ -337,11 +337,11 @@
public void loadUninitialisedNode(Fqn fqn)
{
if (dummyNodesCreatedByCacheLoader == null)
- dummyNodesCreatedByCacheLoader = new LinkedList();
+ dummyNodesCreatedByCacheLoader = new LinkedList<Fqn>();
dummyNodesCreatedByCacheLoader.add(fqn);
}
- public List getDummyNodesCreatedByCacheLoader()
+ public List<Fqn> getDummyNodesCreatedByCacheLoader()
{
return dummyNodesCreatedByCacheLoader;
}
More information about the jboss-cvs-commits
mailing list