diff options
author | Benoit Foucher <benoit@zeroc.com> | 2014-09-24 12:35:38 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2014-09-24 12:35:38 +0200 |
commit | c74b14cc8d247109c8a877e4c9b948a9d9143d61 (patch) | |
tree | 87ad62ab9e03e960f6081fd55ec1483774e95a88 /js/test/Ice/inheritance/Client.js | |
parent | bug fix in IceGrid admin client (diff) | |
download | ice-c74b14cc8d247109c8a877e4c9b948a9d9143d61.tar.bz2 ice-c74b14cc8d247109c8a877e4c9b948a9d9143d61.tar.xz ice-c74b14cc8d247109c8a877e4c9b948a9d9143d61.zip |
Fixed ICE-5535, WSS hang and other minor issues
- ICE-5535: added support for parsing TCP/SSL/WS/WSS endpoints even if the transport isn't supported
- WSS implementation could hang under Java/C# if the SSL transport read too much data
- The opaque endpoint un-marshalling code in Java/C# could raise an EncapsulationException where it should have raised an UnarmshalOutOfBoundsException if the marshalled endpoint was invalid.
- Cleaned up JavaScript run methods for tests
- Few other minor fixes
Diffstat (limited to 'js/test/Ice/inheritance/Client.js')
-rw-r--r-- | js/test/Ice/inheritance/Client.js | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/js/test/Ice/inheritance/Client.js b/js/test/Ice/inheritance/Client.js index fa73d971feb..d1e30bad920 100644 --- a/js/test/Ice/inheritance/Client.js +++ b/js/test/Ice/inheritance/Client.js @@ -77,9 +77,9 @@ out.write("getting proxies for interface hierarchy... "); return Promise.all(initial.iaop(), - initial.ib1op(), - initial.ib2op(), - initial.icop()); + initial.ib1op(), + initial.ib2op(), + initial.icop()); } ).then( function(r1, r2, r3, r4) @@ -279,19 +279,18 @@ var run = function(out, id) { + var c = Ice.initialize(id); return Promise.try( function() { - var c = Ice.initialize(id); - return allTests(out, c).finally( - function() - { - if(c) - { - return c.destroy(); - } - }); - }); + return allTests(out, c); + } + ).finally( + function() + { + return c.destroy(); + } + ); }; exports.__test__ = run; exports.__clientAllTests__ = allTests; |