diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2013-07-15 14:05:43 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2013-07-15 14:05:43 +0200 |
| commit | a8b3981056e06bc4f74e4d35b3ad23beafba0145 (patch) | |
| tree | d8b6c3fc2f909ed0bd30b3c814445279cd605021 | |
| parent | 1a22a3ef0b4a81edd80a3e9a83676d10ca73eb1a (diff) | |
No need to store a POA in the locators
| -rw-r--r-- | src/main/java/com/c2kernel/entity/CorbaServer.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/entity/TraceableLocator.java | 8 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/entity/agent/ActiveLocator.java | 9 |
3 files changed, 4 insertions, 17 deletions
diff --git a/src/main/java/com/c2kernel/entity/CorbaServer.java b/src/main/java/com/c2kernel/entity/CorbaServer.java index c061ecc..3d7c79b 100644 --- a/src/main/java/com/c2kernel/entity/CorbaServer.java +++ b/src/main/java/com/c2kernel/entity/CorbaServer.java @@ -105,10 +105,10 @@ public class CorbaServer { policies );
//Create the locators
- TraceableLocator itemLocator = new TraceableLocator( mItemPOA );
+ TraceableLocator itemLocator = new TraceableLocator();
mItemPOA.set_servant_manager( itemLocator._this( Gateway.getORB() ) );
- ActiveLocator agentLocator = new ActiveLocator( mAgentPOA );
+ ActiveLocator agentLocator = new ActiveLocator();
mAgentPOA.set_servant_manager( agentLocator._this( Gateway.getORB() ) );
}
diff --git a/src/main/java/com/c2kernel/entity/TraceableLocator.java b/src/main/java/com/c2kernel/entity/TraceableLocator.java index 50bba03..387779b 100644 --- a/src/main/java/com/c2kernel/entity/TraceableLocator.java +++ b/src/main/java/com/c2kernel/entity/TraceableLocator.java @@ -30,14 +30,8 @@ public class TraceableLocator extends org.omg.PortableServer.ServantLocatorPOA /**************************************************************************
*
**************************************************************************/
- private final org.omg.PortableServer.POA mParentPoa;
-
- /**************************************************************************
- *
- **************************************************************************/
- public TraceableLocator( org.omg.PortableServer.POA poa )
+ public TraceableLocator()
{
- mParentPoa = poa;
}
diff --git a/src/main/java/com/c2kernel/entity/agent/ActiveLocator.java b/src/main/java/com/c2kernel/entity/agent/ActiveLocator.java index 5a5d5ac..f3d4fb0 100644 --- a/src/main/java/com/c2kernel/entity/agent/ActiveLocator.java +++ b/src/main/java/com/c2kernel/entity/agent/ActiveLocator.java @@ -30,15 +30,8 @@ public class ActiveLocator extends org.omg.PortableServer.ServantLocatorPOA /**************************************************************************
*
**************************************************************************/
- private final org.omg.PortableServer.POA mParentPoa;
-
-
- /**************************************************************************
- *
- **************************************************************************/
- public ActiveLocator( org.omg.PortableServer.POA poa )
+ public ActiveLocator()
{
- mParentPoa = poa;
}
|