From 40ef76037aeac4ee2b9d857a092e5ea026c0bb5c Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Wed, 14 May 2014 13:23:26 +0200
Subject: Refactored Proxy update notification server into its own class and
 thread, so executions return before proxy messages are sent. Another deadlock
 suspect.

---
 .../com/c2kernel/entity/proxy/ProxyManager.java    | 72 +---------------------
 1 file changed, 1 insertion(+), 71 deletions(-)

(limited to 'src/main/java/com/c2kernel/entity/proxy/ProxyManager.java')

diff --git a/src/main/java/com/c2kernel/entity/proxy/ProxyManager.java b/src/main/java/com/c2kernel/entity/proxy/ProxyManager.java
index d19e38f..b217f3e 100644
--- a/src/main/java/com/c2kernel/entity/proxy/ProxyManager.java
+++ b/src/main/java/com/c2kernel/entity/proxy/ProxyManager.java
@@ -26,7 +26,6 @@ import com.c2kernel.process.Gateway;
 import com.c2kernel.property.Property;
 import com.c2kernel.utils.Logger;
 import com.c2kernel.utils.SoftCache;
-import com.c2kernel.utils.server.SimpleTCPIPServer;
 
 
 public class ProxyManager
@@ -35,11 +34,6 @@ public class ProxyManager
     HashMap<DomainPathSubscriber, DomainPath>         treeSubscribers = new HashMap<DomainPathSubscriber, DomainPath>();
     HashMap<String, ProxyServerConnection>         connections = new HashMap<String, ProxyServerConnection>();
 
-    // server objects
-    static ArrayList<ProxyClientConnection> proxyClients      = new ArrayList<ProxyClientConnection>();
-    static SimpleTCPIPServer proxyServer = null;
-    static String serverName = null;
-
     /**
      * Create a proxy manager to listen for proxy events and reap unused proxies
      */
@@ -268,70 +262,6 @@ public class ProxyManager
     }
 
 
-    /**************************************************************************
-     * Static Proxy Server methods
-     **************************************************************************/
-
-    /**
-     * Initialises the Proxy event UDP server listening on 'Host.Proxy.port' from c2kprops
-     * @param c2kProps
-     */
-    public static void initServer()
-    {
-        Logger.msg(5, "ProxyManager::initServer - Starting.....");
-        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 changes.");
-            return;
-        }
-
-        // set up the proxy server
-        try {
-            Logger.msg(5, "ProxyManager::initServer - Initialising proxy informer on port "+port);
-            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 changes.");
-            Logger.error(ex);
-        }
-    }
-
-    public static void sendProxyEvent(ProxyMessage message) {
-        if (proxyServer != null && message.getPath() != null)
-            synchronized(proxyClients) {
-                for (ProxyClientConnection client : proxyClients) {
-                    client.sendMessage(message);
-                }
-            }
-    }
-
-    public static void reportConnections(int logLevel) {
-        synchronized(proxyClients) {
-            Logger.msg(logLevel, "Currently connected proxy clients:");
-            for (ProxyClientConnection client : proxyClients) {
-                Logger.msg(logLevel, "   "+client);
-            }
-        }
-    }
-
-    public static void shutdownServer() {
-        if (proxyServer != null) {
-            Logger.msg(1, "ProxyManager: Closing Server.");
-            proxyServer.stopListening();
-        }
-    }
-
-    public static void registerProxyClient(ProxyClientConnection client) {
-        synchronized(proxyClients) {
-            proxyClients.add(client);
-        }
-    }
-
-    public static void unRegisterProxyClient(ProxyClientConnection client) {
-        synchronized(proxyClients) {
-            proxyClients.remove(client);
-        }
-    }
+    
 }
 
-- 
cgit v1.2.3