diff options
| author | Jose <jose@zeroc.com> | 2016-03-31 21:20:49 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-31 21:20:49 +0200 |
| commit | 758f6a9b7d831533a1ba5efdd28fd9866e6abea5 (patch) | |
| tree | b9a7c950ad2b51c46a868c17a5fe72187da76b38 /js/test | |
| parent | ICE-7084 - JavaScript Number.isNan not implemented in IE (diff) | |
| download | ice-758f6a9b7d831533a1ba5efdd28fd9866e6abea5.tar.bz2 ice-758f6a9b7d831533a1ba5efdd28fd9866e6abea5.tar.xz ice-758f6a9b7d831533a1ba5efdd28fd9866e6abea5.zip | |
JavaScript close connection issues:
- ICE-7079 timeout overrides failures with chrome windows wss workers
- ICE-7080 JavaScript uncaught error in WSTransceiver write
Diffstat (limited to 'js/test')
| -rw-r--r-- | js/test/Ice/timeout/Client.js | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/js/test/Ice/timeout/Client.js b/js/test/Ice/timeout/Client.js index 77413d7a0cd..533f52560d9 100644 --- a/js/test/Ice/timeout/Client.js +++ b/js/test/Ice/timeout/Client.js @@ -44,7 +44,8 @@ test(obj !== null); mult = 1; - if(communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp") === "ssl") + if(communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp") === "ssl" || + communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp") === "wss") { mult = 4; } @@ -332,26 +333,6 @@ ).then( function() { - // - // Some browsers (Chrome) appear to not cancel the - // connection establishment even of the web socket is - // closed and the next connect succeeds. We perform - // another connection establishment and close the - // connection. - // - return to.ice_getConnection(); - } - ).then( - function(con) - { - con.close(true); - }, - function(ex) - { - } - ).then( - function() - { return timeout.holdAdapter(750 * mult); } ).then( @@ -431,8 +412,7 @@ function() { p.succeed(); - } - ); + }); return p; }; |