[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/transaction ...
Manik Surtani
manik at jboss.org
Mon Jun 11 08:58:17 EDT 2007
User: msurtani
Date: 07/06/11 08:58:17
Modified: tests/functional/org/jboss/cache/transaction
AsyncRollbackTransactionManager.java
ConcurrentBankTest.java
ConcurrentTransactionalTest.java DeadlockTest.java
Log:
Reduce Java5 related ide generated warnings
Revision Changes Path
1.3 +3 -3 JBossCache/tests/functional/org/jboss/cache/transaction/AsyncRollbackTransactionManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AsyncRollbackTransactionManager.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/transaction/AsyncRollbackTransactionManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AsyncRollbackTransactionManager.java 9 Jan 2007 01:43:10 -0000 1.2
+++ AsyncRollbackTransactionManager.java 11 Jun 2007 12:58:17 -0000 1.3
@@ -116,7 +116,7 @@
}
AsyncRollbackTransaction tx = new AsyncRollbackTransaction(this, timeout);
setTransaction(tx);
- txMap.put(new Long(tx.generateTransactionId()), tx);
+ txMap.put(tx.generateTransactionId(), tx);
}
@@ -130,7 +130,7 @@
{
if (tx != null)
{
- txMap.remove(new Long(tx.getTransactionId()));
+ txMap.remove(tx.getTransactionId());
}
}
@@ -140,7 +140,7 @@
AsyncRollbackTransaction tx = (AsyncRollbackTransaction) getTransaction();
if (tx != null)
{
- txMap.remove(new Long(tx.getTransactionId()));
+ txMap.remove(tx.getTransactionId());
}
super.commit();
}
1.10 +2 -4 JBossCache/tests/functional/org/jboss/cache/transaction/ConcurrentBankTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConcurrentBankTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/transaction/ConcurrentBankTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ConcurrentBankTest.java 11 Jan 2007 13:49:06 -0000 1.9
+++ ConcurrentBankTest.java 11 Jun 2007 12:58:17 -0000 1.10
@@ -27,7 +27,7 @@
*
* @author <a href="mailto:spohl at users.sourceforge.net">Stefan Pohl</a>
* @author Ben Wang
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class ConcurrentBankTest extends TestCase
{
@@ -261,10 +261,8 @@
try
{
Set set = cache.getKeys(NODE);// gets read lock
- Iterator iter = set.iterator();
- while (iter.hasNext())
+ for (Object name : set)
{
- String name = (String) iter.next();
result.put(name, cache.get(NODE, name));
}
return result;
1.9 +4 -7 JBossCache/tests/functional/org/jboss/cache/transaction/ConcurrentTransactionalTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConcurrentTransactionalTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/transaction/ConcurrentTransactionalTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ConcurrentTransactionalTest.java 11 Jan 2007 13:49:06 -0000 1.8
+++ ConcurrentTransactionalTest.java 11 Jun 2007 12:58:17 -0000 1.9
@@ -23,7 +23,6 @@
import javax.naming.NamingException;
import javax.transaction.UserTransaction;
import java.util.Collections;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
@@ -33,7 +32,7 @@
* Unit test for local CacheImpl. Use locking and multiple threads to test
* concurrent access to the tree.
*
- * @version $Id: ConcurrentTransactionalTest.java,v 1.8 2007/01/11 13:49:06 msurtani Exp $
+ * @version $Id: ConcurrentTransactionalTest.java,v 1.9 2007/06/11 12:58:17 msurtani Exp $
*/
public class ConcurrentTransactionalTest extends TestCase
{
@@ -150,7 +149,7 @@
try
{
System.out.println("size=" + keys.size());
- List l = new LinkedList(keys);
+ List<Integer> l = new LinkedList<Integer>(keys);
Collections.sort(l);
System.out.println("keys: " + l);
for (int i = 0; i < NUM; i++)
@@ -162,9 +161,8 @@
}
LinkedList duplicates = new LinkedList();
- for (Iterator it = l.iterator(); it.hasNext();)
+ for (Integer integer : l)
{
- Integer integer = (Integer) it.next();
if (duplicates.contains(integer))
{
System.out.println(integer + " is a duplicate");
@@ -194,9 +192,8 @@
private void scanForNullValues(Set keys)
{
- for (Iterator it = keys.iterator(); it.hasNext();)
+ for (Object o : keys)
{
- Object o = it.next();
if (o == null)
{
System.err.println("found a null value in keys");
1.12 +2 -3 JBossCache/tests/functional/org/jboss/cache/transaction/DeadlockTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DeadlockTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/transaction/DeadlockTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- DeadlockTest.java 7 Feb 2007 22:06:43 -0000 1.11
+++ DeadlockTest.java 11 Jun 2007 12:58:17 -0000 1.12
@@ -31,7 +31,7 @@
* Tests transactional access to a local CacheImpl, with concurrent (deadlock-prone) access.
* Note: we use DummpyTranasctionManager to replace jta
*
- * @version $Id: DeadlockTest.java,v 1.11 2007/02/07 22:06:43 genman Exp $
+ * @version $Id: DeadlockTest.java,v 1.12 2007/06/11 12:58:17 msurtani Exp $
*/
public class DeadlockTest extends TestCase
{
@@ -236,9 +236,8 @@
}
// all threads now try to upgrade the RL to a WL
- for (int i = 0; i < upgraders.length; i++)
+ for (MyUpgrader upgrader : upgraders)
{
- MyThread upgrader = upgraders[i];
upgrader.join();
}
}
More information about the jboss-cvs-commits
mailing list