Enhancements to remote rpc server. Using zmq router-dealer bridge to make the server...

[controller.git] / opendaylight / md-sal / sal-remoterpc-connector / implementation / src / main / java / org / opendaylight / controller / sal / connector / remoterpc / Context.java

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/Context.java b/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/Context.java
index f0bf12cbc08c149011cab9c935153c52342d043a..9e66c20613e89db5cc5825e376b339ef52f9bba7 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/Context.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/Context.java
@@ -21,6 +21,7 @@ import java.util.Enumeration;
 public class Context {
   private ZMQ.Context zmqContext = ZMQ.context(1);
   private String uri;
+  private final String DEFAULT_RPC_PORT = "5554";
 
   private static Context _instance = new Context();
 
@@ -36,7 +37,7 @@ public class Context {
 
   public String getLocalUri(){
     uri = (uri != null) ? uri
-            : new StringBuilder("tcp://").append(getIpAddress()).append(":")
+            : new StringBuilder().append(getIpAddress()).append(":")
               .append(getRpcPort()).toString();
 
     return uri;
@@ -45,7 +46,7 @@ public class Context {
   public String getRpcPort(){
     String rpcPort = (System.getProperty("rpc.port") != null)
         ? System.getProperty("rpc.port")
-        : "5554";
+        : DEFAULT_RPC_PORT;
 
     return rpcPort;
   }