Fixed ICE-6680 - WS transports are now provided by a separate IceWS plugin

1 files changed, 17 insertions, 11 deletions

diff --git a/js/src/Ice/EndpointFactoryManager.js b/js/src/Ice/EndpointFactoryManager.js
index 04e1f6c8f75..5a3db1da8c2 100644
--- a/js/src/Ice/EndpointFactoryManager.js
+++ b/js/src/Ice/EndpointFactoryManager.js
@@ -126,19 +126,25 @@ class EndpointFactoryManager
     read(s)
     {
         const type = s.readShort();
-        for(let i = 0; i < this._factories.length; ++i)
+
+        const factory = this.get(type);
+        let e = null;
+        s.startEncapsulation();
+        if(factory)
         {
-            if(this._factories[i].type() == type)
-            {
-                s.startEncapsulation();
-                const e = this._factories[i].read(s);
-                s.endEncapsulation();
-                return e;
-            }
+            e = factory.read(s);
+        }
+        //
+        // If the factory failed to read the endpoint, return an opaque endpoint. This can
+        // occur if for example the factory delegates to another factory and this factory
+        // isn't available. In this case, the factory needs to make sure the stream position
+        // is preserved for reading the opaque endpoint.
+        //
+        if(!e)
+        {
+            e = new OpaqueEndpointI(type);
+            e.initWithStream(s);
         }
-        s.startEncapsulation();
-        const e = new OpaqueEndpointI(type);
-        e.initWithStream(s);
         s.endEncapsulation();
         return e;
     }