porting C++ transport changes to Java

1 files changed, 15 insertions, 4 deletions

diff --git a/java/test/Ice/background/EndpointFactory.java b/java/test/Ice/background/EndpointFactory.java
index b611e5bf911..55aba553082 100644
--- a/java/test/Ice/background/EndpointFactory.java
+++ b/java/test/Ice/background/EndpointFactory.java
@@ -29,16 +29,21 @@ final class EndpointFactory implements IceInternal.EndpointFactory
     }
 
     public IceInternal.EndpointI
-    create(String str, boolean server)
+    create(java.util.ArrayList<String> args, boolean server)
     {
-        return new EndpointI(_configuration, _factory.create(str, server));
+        return new EndpointI(_configuration, _factory.create(args, server));
     }
 
     public IceInternal.EndpointI
     read(IceInternal.BasicStream s)
     {
-        s.readShort();
-        return new EndpointI(_configuration, _factory.read(s));
+        short type = s.readShort();
+        assert(type == _factory.type());
+
+        s.startReadEncaps();
+        IceInternal.EndpointI endpoint = new EndpointI(_configuration, _factory.read(s));
+        s.endReadEncaps();
+        return endpoint;
     }
 
     public void
@@ -46,6 +51,12 @@ final class EndpointFactory implements IceInternal.EndpointFactory
     {
     }
 
+    public IceInternal.EndpointFactory
+    clone(IceInternal.ProtocolInstance instance)
+    {
+        return this;
+    }
+
     private Configuration _configuration;
     private IceInternal.EndpointFactory _factory;
 }