summaryrefslogtreecommitdiff
path: root/src/main/java/com/c2kernel/entity/proxy/EntityProxyManager.java
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2014-02-26 10:29:36 +0100
committerAndrew Branson <andrew.branson@cern.ch>2014-02-26 10:29:36 +0100
commit755bb76c94953b62a08e9fecf523bc5c42ec79ac (patch)
tree63edd567272cd87edd55eeb55a5fc814e1f6079d /src/main/java/com/c2kernel/entity/proxy/EntityProxyManager.java
parent1faab1fd00f70881d4666d766fd0f033e172ff80 (diff)
Properties extended as ObjectProperties, which can return any Object,
and wrap int and boolean parsing. Gateway.getProperties() returns the new ObjectProperty instance. Old Gateway property methods still present but deprecated. Refs #149
Diffstat (limited to 'src/main/java/com/c2kernel/entity/proxy/EntityProxyManager.java')
-rw-r--r--src/main/java/com/c2kernel/entity/proxy/EntityProxyManager.java9
1 files changed, 4 insertions, 5 deletions
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.");