From 339eac0a04102ca05bb49a43d905601a4972a2a3 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Tue, 25 Jun 2013 17:01:53 +0200
Subject: Imply correct POA when calling getItem and getAgent, so other places
 can call it

---
 src/main/java/com/c2kernel/entity/CorbaServer.java         | 10 +++++-----
 src/main/java/com/c2kernel/entity/TraceableEntity.java     |  2 +-
 src/main/java/com/c2kernel/entity/TraceableLocator.java    |  4 ++--
 src/main/java/com/c2kernel/entity/agent/ActiveLocator.java |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/c2kernel/entity/CorbaServer.java b/src/main/java/com/c2kernel/entity/CorbaServer.java
index 84d2ef2..c061ecc 100644
--- a/src/main/java/com/c2kernel/entity/CorbaServer.java
+++ b/src/main/java/com/c2kernel/entity/CorbaServer.java
@@ -31,7 +31,7 @@ import com.c2kernel.utils.SoftCache;
 
 
 public class CorbaServer {
-    private Map<EntityPath, Servant>         mEntityCache;
+    private final Map<EntityPath, Servant>         mEntityCache;
     private POA         mRootPOA;
     private POA         mItemPOA;
     private POA         mAgentPOA;
@@ -149,15 +149,15 @@ public class CorbaServer {
     /**************************************************************************
      * Wrapper for fetching Items
      **************************************************************************/
-    public TraceableEntity getItem(int sysKey, org.omg.PortableServer.POA poa) throws ObjectNotFoundException {
-        return (TraceableEntity)getEntity(sysKey, poa);
+    public TraceableEntity getItem(int sysKey) throws ObjectNotFoundException {
+        return (TraceableEntity)getEntity(sysKey, mItemPOA);
     }
 
     /**************************************************************************
      * Wrapper for fetching Agents
      **************************************************************************/
-    public ActiveEntity getAgent(int sysKey, org.omg.PortableServer.POA poa) throws ObjectNotFoundException {
-        return (ActiveEntity)getEntity(sysKey, poa);
+    public ActiveEntity getAgent(int sysKey) throws ObjectNotFoundException {
+        return (ActiveEntity)getEntity(sysKey, mAgentPOA);
     }
 
     /**
diff --git a/src/main/java/com/c2kernel/entity/TraceableEntity.java b/src/main/java/com/c2kernel/entity/TraceableEntity.java
index 93f9407..83c30a2 100644
--- a/src/main/java/com/c2kernel/entity/TraceableEntity.java
+++ b/src/main/java/com/c2kernel/entity/TraceableEntity.java
@@ -117,7 +117,7 @@ public class TraceableEntity extends ItemPOA
                InvalidDataException,
                PersistencyException
     {
-        Logger.msg(1, "TraceableEntity::initialise("+mSystemKey+") - agent:"+agentId);
+        Logger.msg(5, "TraceableEntity::initialise("+mSystemKey+") - agent:"+agentId);
         synchronized (this) {
             Workflow lc   = null;
             PropertyArrayList props = null;
diff --git a/src/main/java/com/c2kernel/entity/TraceableLocator.java b/src/main/java/com/c2kernel/entity/TraceableLocator.java
index 5f237d7..50bba03 100644
--- a/src/main/java/com/c2kernel/entity/TraceableLocator.java
+++ b/src/main/java/com/c2kernel/entity/TraceableLocator.java
@@ -30,7 +30,7 @@ public class TraceableLocator extends org.omg.PortableServer.ServantLocatorPOA
    /**************************************************************************
     *
     **************************************************************************/
-    private org.omg.PortableServer.POA              mParentPoa;
+    private final org.omg.PortableServer.POA              mParentPoa;
 
    /**************************************************************************
     *
@@ -60,7 +60,7 @@ public class TraceableLocator extends org.omg.PortableServer.ServantLocatorPOA
             Logger.msg(1,"Item called at "+new Timestamp( System.currentTimeMillis()) +": " + operation +
                            "(" + syskey + ")." );
 
-            return Gateway.getCorbaServer().getItem(syskey, mParentPoa);
+            return Gateway.getCorbaServer().getItem(syskey);
 
         }
         catch (ObjectNotFoundException ex)
diff --git a/src/main/java/com/c2kernel/entity/agent/ActiveLocator.java b/src/main/java/com/c2kernel/entity/agent/ActiveLocator.java
index eb50dbf..5a5d5ac 100644
--- a/src/main/java/com/c2kernel/entity/agent/ActiveLocator.java
+++ b/src/main/java/com/c2kernel/entity/agent/ActiveLocator.java
@@ -30,7 +30,7 @@ public class ActiveLocator extends org.omg.PortableServer.ServantLocatorPOA
    /**************************************************************************
     *
     **************************************************************************/
-    private org.omg.PortableServer.POA                  mParentPoa;
+    private final org.omg.PortableServer.POA                  mParentPoa;
 
 
    /**************************************************************************
@@ -61,7 +61,7 @@ public class ActiveLocator extends org.omg.PortableServer.ServantLocatorPOA
             Logger.msg(1,"Agent called at "+new Timestamp( System.currentTimeMillis()) +": " + operation +
                     "(" + syskey + ")." );
 
-            return Gateway.getCorbaServer().getAgent(syskey, mParentPoa);
+            return Gateway.getCorbaServer().getAgent(syskey);
 
         }
         catch (ObjectNotFoundException ex)
-- 
cgit v1.2.3