diff options
| author | Jose <jose@zeroc.com> | 2015-07-20 19:41:28 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-07-20 19:41:28 +0200 |
| commit | 43c41e6bd2135089f273272ef707eac48dd074ff (patch) | |
| tree | 6a99e4ae59ab1c0e909e9420e5fc3d832918b34c /js/test | |
| parent | ICE-6316 confirm abort of icepatch2client (diff) | |
| download | ice-43c41e6bd2135089f273272ef707eac48dd074ff.tar.bz2 ice-43c41e6bd2135089f273272ef707eac48dd074ff.tar.xz ice-43c41e6bd2135089f273272ef707eac48dd074ff.zip | |
Fix issue with JavaScript brwoser mapping when proxy contains TCP endpoints
Diffstat (limited to 'js/test')
| -rw-r--r-- | js/test/Ice/proxy/Client.js | 13 |
1 files changed, 13 insertions, 0 deletions
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(); |