2 files changed, 4 insertions, 9 deletions
diff --git a/src/main/java/com/c2kernel/entity/agent/Job.java b/src/main/java/com/c2kernel/entity/agent/Job.java
index 7717fdb..02dd541 100644
--- a/src/main/java/com/c2kernel/entity/agent/Job.java
+++ b/src/main/java/com/c2kernel/entity/agent/Job.java
@@ -3,7 +3,6 @@ package com.c2kernel.entity.agent;
 import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.entity.proxy.AgentProxy;
 import com.c2kernel.entity.proxy.ItemProxy;
 import com.c2kernel.lifecycle.instance.Activity;
 import com.c2kernel.lifecycle.instance.stateMachine.Transition;
@@ -63,8 +62,6 @@ public class Job implements C2KLocalObject
 
     private ItemProxy item = null;
 
-    private AgentProxy agent = null;
-    
     private boolean outcomeSet;
 
     /***************************************************************************
@@ -165,7 +162,6 @@ public class Job implements C2KLocalObject
 
     public void setAgentId(int id) {
         agentId = id;
-        agent = null;
     }
     
     public String getAgentName()
diff --git a/src/main/java/com/c2kernel/entity/proxy/EntityProxyManager.java b/src/main/java/com/c2kernel/entity/proxy/EntityProxyManager.java
index 9f134f0..c49e7f5 100644
--- a/src/main/java/com/c2kernel/entity/proxy/EntityProxyManager.java
+++ b/src/main/java/com/c2kernel/entity/proxy/EntityProxyManager.java
@@ -281,18 +281,17 @@ public class EntityProxyManager
     public static void initServer()
     {
         Logger.msg(5, "EntityProxyFactory::initServer - Starting.....");
-        String port = Gateway.getProperty("ItemServer.Proxy.port");
-        serverName = Gateway.getProperty("ItemServer.name");
-        if (port == null) {
+        int port = Gateway.getProperties().getInt("ItemServer.Proxy.port", 0);
+        serverName = Gateway.getProperties().getProperty("ItemServer.name");
+        if (port == 0) {
             Logger.error("ItemServer.Proxy.port not defined in connect file. Remote proxies will not be informed of entity changes.");
             return;
         }
 
         // set up the proxy server
         try {
-            int portNo = Integer.parseInt(port);
             Logger.msg(5, "EntityProxyFactory::initServer - Initialising proxy informer on port "+port);
-            proxyServer = new SimpleTCPIPServer(portNo, ProxyClientConnection.class, 200);
+            proxyServer = new SimpleTCPIPServer(port, ProxyClientConnection.class, 200);
             proxyServer.startListening();
         } catch (Exception ex) {
             Logger.error("Error setting up Proxy Server. Remote proxies will not be informed of entity changes.");