Fix issue with JavaScript brwoser mapping when proxy contains TCP endpoints

2 files changed, 18 insertions, 1 deletions

diff --git a/js/src/Ice/TcpEndpointI.js b/js/src/Ice/TcpEndpointI.js
index c40d70a44d6..f344b9212a5 100644
--- a/js/src/Ice/TcpEndpointI.js
+++ b/js/src/Ice/TcpEndpointI.js
@@ -118,7 +118,11 @@ var TcpEndpointI = Class(Ice.IPEndpointI, {
     },
     connectable: function()
     {
-        return !this.secure(); // We don't support SSL, we can only connect with plain TCP
+        //
+        // TCP endpoints are not connectable when running in a browser, SSL
+        // isn't currently supported.
+        //
+        return TcpTransceiver !== null && !this.secure();
     },
     connect: function()
     {
diff --git a/js/test/Ice/proxy/Client.js b/js/test/Ice/proxy/Client.js
index d31c1f9b1b1..9bb381e7e30 100644
--- a/js/test/Ice/proxy/Client.js
+++ b/js/test/Ice/proxy/Client.js
@@ -1054,6 +1054,19 @@
         ).then(
             function()
             {
+                if(typeof window !== 'undefined')
+                {
+                    //
+                    // Ensure that TCP endpoints are skipped when runing in a browser.
+                    //
+                    var p = communicator.stringToProxy("test:tcp -p 12010:ws -p 12010");
+                    p = p.ice_endpointSelection(Ice.EndpointSelectionType.Ordered);
+                    return p.ice_ping();
+                }
+            }
+        ).then(
+            function()
+            {
                 out.writeLine("ok");
                 var derived = Test.MyDerivedClassPrx.uncheckedCast(communicator.stringToProxy("test:default -p 12010"));
                 return derived.shutdown();