[jboss-cvs] JBossCache/src/org/jboss/cache/transaction ...
Manik Surtani
manik at jboss.org
Mon Jun 11 08:58:16 EDT 2007
User: msurtani
Date: 07/06/11 08:58:16
Modified: src/org/jboss/cache/transaction
GenericTransactionManagerLookup.java
TransactionEntry.java TransactionTable.java
Log:
Reduce Java5 related ide generated warnings
Revision Changes Path
1.2 +17 -17 JBossCache/src/org/jboss/cache/transaction/GenericTransactionManagerLookup.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: GenericTransactionManagerLookup.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/transaction/GenericTransactionManagerLookup.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- GenericTransactionManagerLookup.java 7 Feb 2007 22:06:44 -0000 1.1
+++ GenericTransactionManagerLookup.java 11 Jun 2007 12:58:16 -0000 1.2
@@ -25,7 +25,7 @@
* If a transaction manager is not found, returns a {@link DummyTransactionManager}.
*
* @author Markus Plesser
- * @version $Id: GenericTransactionManagerLookup.java,v 1.1 2007/02/07 22:06:44 genman Exp $
+ * @version $Id: GenericTransactionManagerLookup.java,v 1.2 2007/06/11 12:58:16 msurtani Exp $
*/
public class GenericTransactionManagerLookup implements TransactionManagerLookup
{
@@ -114,25 +114,25 @@
return;
}
//probe jndi lookups first
- for (int i = 0; i < knownJNDIManagers.length; i++)
+ for (String[] knownJNDIManager : knownJNDIManagers)
{
Object jndiObject;
try
{
if (log.isDebugEnabled())
- log.debug("Trying to lookup TransactionManager for " + knownJNDIManagers[i][1]);
- jndiObject = ctx.lookup(knownJNDIManagers[i][0]);
+ log.debug("Trying to lookup TransactionManager for " + knownJNDIManager[1]);
+ jndiObject = ctx.lookup(knownJNDIManager[0]);
}
catch (NamingException e)
{
- log.info("Failed to perform a lookup for [" + knownJNDIManagers[i][0] + " (" + knownJNDIManagers[i][1]
+ log.info("Failed to perform a lookup for [" + knownJNDIManager[0] + " (" + knownJNDIManager[1]
+ ")]");
continue;
}
if (jndiObject instanceof TransactionManager)
{
tm = (TransactionManager) jndiObject;
- log.info("Found TransactionManager for " + knownJNDIManagers[i][1]);
+ log.info("Found TransactionManager for " + knownJNDIManager[1]);
return;
}
}
1.9 +3 -5 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- TransactionEntry.java 6 Jun 2007 12:43:50 -0000 1.8
+++ TransactionEntry.java 11 Jun 2007 12:58:16 -0000 1.9
@@ -22,7 +22,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
@@ -43,7 +42,7 @@
* </ul>
*
* @author <a href="mailto:bela at jboss.org">Bela Ban</a> Apr 14, 2003
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
@ThreadSafe
public class TransactionEntry
@@ -262,13 +261,12 @@
// This seems fairly safe though
synchronized (locks)
{
- for (Iterator<NodeLock> i = locks.iterator(); i.hasNext();)
+ for (NodeLock lock : locks)
{
- IdentityLock lock = (IdentityLock) i.next();
lock.release(owner);
if (log.isTraceEnabled())
{
- log.trace("releasing lock for " + lock.getFqn() + " (" + lock + ")");
+ log.trace("releasing lock for " + ((IdentityLock) lock).getFqn() + " (" + lock + ")");
}
}
}
1.3 +4 -10 JBossCache/src/org/jboss/cache/transaction/TransactionTable.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TransactionTable.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/transaction/TransactionTable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- TransactionTable.java 5 Mar 2007 20:45:23 -0000 1.2
+++ TransactionTable.java 11 Jun 2007 12:58:16 -0000 1.3
@@ -13,7 +13,6 @@
import javax.transaction.Transaction;
import java.util.Collection;
-import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -22,7 +21,7 @@
* Also stores {@link TransactionEntry} instances under a given transaction.
*
* @author <a href="mailto:bela at jboss.org">Bela Ban</a> Apr 14, 2003
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class TransactionTable
{
@@ -90,15 +89,13 @@
*/
public Transaction getLocalTransaction(GlobalTransaction gtx)
{
- Map.Entry entry;
Transaction local_tx;
GlobalTransaction global_tx;
if (gtx == null)
return null;
- for (Iterator it = tx_map.entrySet().iterator(); it.hasNext();)
+ for (Map.Entry<Transaction, GlobalTransaction> entry : tx_map.entrySet())
{
- entry = (Map.Entry) it.next();
local_tx = (Transaction) entry.getKey();
global_tx = (GlobalTransaction) entry.getValue();
if (gtx.equals(global_tx))
@@ -251,19 +248,16 @@
if (!print_details)
return toString();
StringBuffer sb = new StringBuffer();
- Map.Entry entry;
sb.append("LocalTransactions: ").append(tx_map.size()).append("\n");
sb.append("GlobalTransactions: ").append(txs.size()).append("\n");
sb.append("tx_map:\n");
- for (Iterator it = tx_map.entrySet().iterator(); it.hasNext();)
+ for (Map.Entry<Transaction, GlobalTransaction> entry : tx_map.entrySet())
{
- entry = (Map.Entry) it.next();
sb.append(entry.getKey()).append(": ").append(entry.getValue()).append("\n");
}
sb.append("txs:\n");
- for (Iterator it = txs.entrySet().iterator(); it.hasNext();)
+ for (Map.Entry<GlobalTransaction, TransactionEntry> entry : txs.entrySet())
{
- entry = (Map.Entry) it.next();
sb.append(entry.getKey()).append(": ").append(entry.getValue()).append("\n");
}
return sb.toString();
More information about the jboss-cvs-commits
mailing list