From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 00:42:34 +0200
Subject: More code cleanup: Refactored Entity Proxy Subscription to handle
 generics better Rewrote RemoteMap to use TreeMap instead of the internal
 array for order. It now sorts its keys by number if they parse, else as
 strings. Removed a no-longer-in-progress outcome form class

---
 source/com/c2kernel/lookup/NextKeyManager.java | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/lookup/NextKeyManager.java

(limited to 'source/com/c2kernel/lookup/NextKeyManager.java')

diff --git a/source/com/c2kernel/lookup/NextKeyManager.java b/source/com/c2kernel/lookup/NextKeyManager.java
old mode 100755
new mode 100644
index 04581c0..fd873fd
--- a/source/com/c2kernel/lookup/NextKeyManager.java
+++ b/source/com/c2kernel/lookup/NextKeyManager.java
@@ -18,7 +18,7 @@ public class NextKeyManager {
 
     LDAPLookup ldap;
     String lastKeyPath;
-    
+
     public NextKeyManager(LDAPLookup ldap, String lastKeyPath) {
         super();
         this.ldap = ldap;
@@ -28,9 +28,8 @@ public class NextKeyManager {
     public synchronized EntityPath generateNextEntityKey()
     throws ObjectCannotBeUpdated, ObjectNotFoundException
     {
-        LDAPEntry lastKeyEntry = LDAPLookupUtils.getEntry(ldap.getConnection(),lastKeyPath);
         EntityPath lastKey = getLastEntityPath();
-        
+
         try {
             lastKey.setSysKey(lastKey.getSysKey()+1);
         } catch (InvalidEntityPathException ex) {
@@ -38,21 +37,21 @@ public class NextKeyManager {
         }
         //set the last key
         writeLastEntityKey(lastKey.getSysKey());
-        
+
         return lastKey;
     }
-    
+
     public synchronized AgentPath generateNextAgentKey()
     throws ObjectCannotBeUpdated, ObjectNotFoundException {
         EntityPath newEntity = generateNextEntityKey();
         return new AgentPath(newEntity);
     }
-    
+
     public void writeLastEntityKey(int sysKey) throws ObjectCannotBeUpdated, ObjectNotFoundException {
         LDAPEntry lastKeyEntry = LDAPLookupUtils.getEntry(ldap.getConnection(),lastKeyPath);
         LDAPLookupUtils.setAttributeValue(ldap.getConnection(), lastKeyEntry,"intsyskey",Integer.toString(sysKey));
     }
-    
+
     public EntityPath getLastEntityPath() throws ObjectNotFoundException
     {
         LDAPEntry lastKeyEntry = LDAPLookupUtils.getEntry(ldap.getConnection(),lastKeyPath);
@@ -66,7 +65,7 @@ public class NextKeyManager {
         } catch (NumberFormatException ex) {
             throw new ObjectNotFoundException("Invalid syskey in lastkey.");
         }
-        
+
     }
-    
+
 }
-- 
cgit v1.2.3