1 files changed, 16 insertions, 1 deletions
diff --git a/java/src/IceInternal/EndpointI.java b/java/src/IceInternal/EndpointI.java
index 0000be4a8fa..129b4e25190 100644
--- a/java/src/IceInternal/EndpointI.java
+++ b/java/src/IceInternal/EndpointI.java
@@ -11,10 +11,11 @@ package IceInternal;
 
 abstract public class EndpointI implements Ice.Endpoint, java.lang.Comparable<EndpointI>
 {
-    public EndpointI(Ice.ProtocolVersion protocol, Ice.EncodingVersion encoding)
+    public EndpointI(Ice.ProtocolVersion protocol, Ice.EncodingVersion encoding, String connectionId)
     {
         _protocol = protocol;
         _encoding = encoding;
+        _connectionId = connectionId;
     }
 
     public EndpointI()
@@ -97,6 +98,14 @@ abstract public class EndpointI implements Ice.Endpoint, java.lang.Comparable<En
     }
 
     //
+    // Return the connection ID 
+    //
+    public String connectionId()
+    {
+        return _connectionId;
+    }
+
+    //
     // Return a server side transceiver for this endpoint, or null if a
     // transceiver can only be created by an acceptor. In case a
     // transceiver is created, this operation also returns a new
@@ -182,6 +191,11 @@ abstract public class EndpointI implements Ice.Endpoint, java.lang.Comparable<En
             return 1;
         }
 
+        if(!_connectionId.equals(p._connectionId))
+        {
+            return _connectionId.compareTo(p._connectionId);
+        }
+
         return 0;
     }
 
@@ -243,4 +257,5 @@ abstract public class EndpointI implements Ice.Endpoint, java.lang.Comparable<En
 
     protected Ice.ProtocolVersion _protocol;
     protected Ice.EncodingVersion _encoding;
+    protected String _connectionId = "";
 }