diff options
| author | abranson <andrew.branson@cern.ch> | 2011-08-04 16:08:49 +0200 |
|---|---|---|
| committer | abranson <andrew.branson@cern.ch> | 2011-08-04 16:08:49 +0200 |
| commit | 379ed8a0e133bee650e0acb24f6b743f657a50d0 (patch) | |
| tree | bdcac37cabe3f2f3d40715519b830469dc9e63ad /source/com/c2kernel/persistency | |
| parent | 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 (diff) | |
Last bit of cleanup honest
New castor and dependent commons libs
Diffstat (limited to 'source/com/c2kernel/persistency')
3 files changed, 11 insertions, 14 deletions
diff --git a/source/com/c2kernel/persistency/ClusterStorageManager.java b/source/com/c2kernel/persistency/ClusterStorageManager.java index 5ce8d06..b4515e0 100644 --- a/source/com/c2kernel/persistency/ClusterStorageManager.java +++ b/source/com/c2kernel/persistency/ClusterStorageManager.java @@ -283,10 +283,10 @@ public class ClusterStorageManager { Logger.msg(7, "CSM.clearCache() - removing "+sysKeyIntObj+"/"+path);
if (memoryCache.containsKey(sysKeyIntObj)) {
- SoftCache<?, ?> sysKeyMemCache = memoryCache.get(sysKeyIntObj);
+ SoftCache<String, C2KLocalObject> sysKeyMemCache = memoryCache.get(sysKeyIntObj);
synchronized(sysKeyMemCache) {
- for (Iterator<?> iter = sysKeyMemCache.keySet().iterator(); iter.hasNext();) {
- String thisPath = (String)iter.next();
+ for (Iterator<String> iter = sysKeyMemCache.keySet().iterator(); iter.hasNext();) {
+ String thisPath = iter.next();
if (thisPath.startsWith(path)) {
Logger.msg(7, "CSM.clearCache() - removing "+sysKeyIntObj+"/"+thisPath);
iter.remove();
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());
}
}
diff --git a/source/com/c2kernel/persistency/XMLClusterStorage.java b/source/com/c2kernel/persistency/XMLClusterStorage.java index 277551d..5909fac 100644 --- a/source/com/c2kernel/persistency/XMLClusterStorage.java +++ b/source/com/c2kernel/persistency/XMLClusterStorage.java @@ -117,12 +117,12 @@ public class XMLClusterStorage extends ClusterStorage { String[] result = new String[0];
try {
String filePath = getFilePath(sysKey, path);
- ArrayList<?> paths = FileStringUtility.listDir( filePath, true, false );
+ ArrayList<String> paths = FileStringUtility.listDir( filePath, true, false );
if (paths == null) return result; // dir doesn't exist yet
ArrayList<String> contents = new ArrayList<String>();
String previous = null;
for (int i=0; i<paths.size(); i++) {
- String next = (String)paths.get(i);
+ String next = paths.get(i);
// trim off the xml from the end if it's there
if (next.endsWith(".xml")) next = next.substring(0, next.length()-4);
|