Introduced static method ItemPath.fromUUIDString and made the UUID

constructor protected to better handle ItemPath and AgentPath
construction with String UUIDs, throwing the right exceptions.

2 files changed, 8 insertions, 9 deletions

diff --git a/src/main/java/com/c2kernel/entity/agent/ActiveLocator.java b/src/main/java/com/c2kernel/entity/agent/ActiveLocator.java
index 966b265..a1561ed 100644
--- a/src/main/java/com/c2kernel/entity/agent/ActiveLocator.java
+++ b/src/main/java/com/c2kernel/entity/agent/ActiveLocator.java
@@ -14,11 +14,11 @@ package com.c2kernel.entity.agent;
 

 import java.nio.ByteBuffer;

 import java.sql.Timestamp;

-import java.util.UUID;

 

 import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.SystemKey;

 import com.c2kernel.lookup.AgentPath;

-import com.c2kernel.lookup.InvalidAgentPathException;

+import com.c2kernel.lookup.InvalidItemPathException;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.utils.Logger;

 

@@ -55,7 +55,7 @@ public class ActiveLocator extends org.omg.PortableServer.ServantLocatorPOA
         	ByteBuffer bb = ByteBuffer.wrap(oid);

         	long msb = bb.getLong();

         	long lsb = bb.getLong();

-        	AgentPath syskey = new AgentPath(new UUID(msb, lsb));

+        	AgentPath syskey = new AgentPath(new SystemKey(msb, lsb));

 

             Logger.msg(1,"===========================================================");

             Logger.msg(1,"Agent called at "+new Timestamp( System.currentTimeMillis()) +": " + operation +

@@ -68,8 +68,8 @@ public class ActiveLocator extends org.omg.PortableServer.ServantLocatorPOA
         {

             Logger.error("ObjectNotFoundException::ActiveLocator::preinvoke() "+ex.toString());

             throw new org.omg.CORBA.OBJECT_NOT_EXIST();

-        } catch (InvalidAgentPathException ex) {

-        	Logger.error("InvalidAgentPathException::ActiveLocator::preinvoke() "+ex.toString());

+        } catch (InvalidItemPathException ex) {

+        	Logger.error("InvalidItemPathException::ActiveLocator::preinvoke() "+ex.toString());

         	throw new org.omg.CORBA.INV_OBJREF();

 		}

     }

diff --git a/src/main/java/com/c2kernel/entity/agent/Job.java b/src/main/java/com/c2kernel/entity/agent/Job.java
index 13bd268..97f8eef 100644
--- a/src/main/java/com/c2kernel/entity/agent/Job.java
+++ b/src/main/java/com/c2kernel/entity/agent/Job.java
@@ -1,7 +1,6 @@
 package com.c2kernel.entity.agent;

 

 import java.util.HashMap;

-import java.util.UUID;

 

 import com.c2kernel.common.InvalidDataException;

 import com.c2kernel.common.ObjectNotFoundException;

@@ -132,9 +131,9 @@ public class Job implements C2KLocalObject
         item = null;

     }	

 

-    public void setItemUUID( String uuid )

+    public void setItemUUID( String uuid ) throws InvalidItemPathException

     {

-    	setItemPath(new ItemPath(UUID.fromString(uuid)));

+    	setItemPath(ItemPath.fromUUIDString(uuid));

     }

     

     public String getItemUUID() {

@@ -189,7 +188,7 @@ public class Job implements C2KLocalObject
     {

     	if (uuid != null) 

     		try {

-				setAgentPath(new AgentPath(UUID.fromString(uuid)));

+				setAgentPath(AgentPath.fromUUIDString(uuid));

 			} catch (InvalidAgentPathException e) {

 				Logger.error("Invalid agent path in Job: "+uuid);

 			}