From 379ed8a0e133bee650e0acb24f6b743f657a50d0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 16:08:49 +0200
Subject: Last bit of cleanup honest New castor and dependent commons libs

---
 source/com/c2kernel/persistency/TransactionManager.java | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'source/com/c2kernel/persistency/TransactionManager.java')

diff --git a/source/com/c2kernel/persistency/TransactionManager.java b/source/com/c2kernel/persistency/TransactionManager.java
index 6517d8b..6f930b7 100644
--- a/source/com/c2kernel/persistency/TransactionManager.java
+++ b/source/com/c2kernel/persistency/TransactionManager.java
@@ -65,9 +65,8 @@ public class TransactionManager {
         // check to see if the locker has been modifying this cluster
         synchronized(locks) {
             if (locks.containsKey(sysKeyIntObj) && locks.get(sysKeyIntObj).equals(locker)) {
-                ArrayList<?> lockerTransaction = pendingTransactions.get(locker);
-                for (Object name : lockerTransaction) {
-                    TransactionEntry thisEntry = (TransactionEntry)name;
+                ArrayList<TransactionEntry> lockerTransaction = pendingTransactions.get(locker);
+                for (TransactionEntry thisEntry : lockerTransaction) {
                     if (sysKey == thisEntry.sysKey.intValue() && path.equals(thisEntry.getPath())) {
                         if (thisEntry.obj == null)
                             throw new ClusterStorageException("ClusterStorageManager.get() - Cluster " + path + " has been deleted in " + sysKey +
@@ -187,12 +186,11 @@ public class TransactionManager {
      */
     public void commit(Object locker) {
         synchronized(locks) {
-            ArrayList<?> lockerTransactions = pendingTransactions.get(locker);
+            ArrayList<TransactionEntry> lockerTransactions = pendingTransactions.get(locker);
             HashMap<TransactionEntry, Exception> exceptions = new HashMap<TransactionEntry, Exception>();
             // quit if no transactions are present;
             if (lockerTransactions == null) return;
-            for (Object name : lockerTransactions) {
-                TransactionEntry thisEntry = (TransactionEntry)name;
+            for (TransactionEntry thisEntry : lockerTransactions) {
                 try {
                 	if (thisEntry.obj == null)
                 	    storage.remove(thisEntry.sysKey, thisEntry.path);
@@ -261,9 +259,8 @@ public class TransactionManager {
 		else
 			for (Object thisLocker : pendingTransactions.keySet()) {
 				Logger.msg(logLevel, "  Transaction owner:"+thisLocker);
-				ArrayList<?> entries = pendingTransactions.get(thisLocker);
-				for (Object name : entries) {
-					TransactionEntry thisEntry = (TransactionEntry) name;
+				ArrayList<TransactionEntry> entries = pendingTransactions.get(thisLocker);
+				for (TransactionEntry thisEntry : entries) {
 					Logger.msg(logLevel, "    "+thisEntry.toString());
 				}
 			}
-- 
cgit v1.2.3