Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/c2kernel/entity/proxy/ProxyServerConnection.java b/src/main/java/com/c2kernel/entity/proxy/ProxyServerConnection.java
index 6807953..54ca787 100644
--- a/src/main/java/com/c2kernel/entity/proxy/ProxyServerConnection.java
+++ b/src/main/java/com/c2kernel/entity/proxy/ProxyServerConnection.java
@@ -29,7 +29,7 @@ public class ProxyServerConnection extends Thread
     String serverName;

     int serverPort;

     Socket serverConnection;

-    EntityProxyManager manager;

+    ProxyManager manager;

     // for talking to the proxy server

     PrintWriter serverStream;

     boolean listening = false;

@@ -38,7 +38,7 @@ public class ProxyServerConnection extends Thread
     /**

      * Create an entity proxy manager to listen for proxy events and reap unused proxies

      */

-    public ProxyServerConnection(String host, int port, EntityProxyManager manager)

+    public ProxyServerConnection(String host, int port, ProxyManager manager)

     {

         Logger.msg(5, "ProxyServerConnection - Initialising connection to "+host+":"+port);

         serverName = host;