summaryrefslogtreecommitdiff
path: root/js/test/Ice/timeout/Client.js
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2017-01-30 13:45:21 -0800
committerMark Spruiell <mes@zeroc.com>2017-01-30 13:45:21 -0800
commit61270a10f980933cf582edb766f10c8ac6d86e8a (patch)
tree45ab4a7c2986954054fce613bc3c8f7967e7951e /js/test/Ice/timeout/Client.js
parentFix slice2cpp build failure (diff)
downloadice-61270a10f980933cf582edb766f10c8ac6d86e8a.tar.bz2
ice-61270a10f980933cf582edb766f10c8ac6d86e8a.tar.xz
ice-61270a10f980933cf582edb766f10c8ac6d86e8a.zip
merging IceBridge into master
Diffstat (limited to 'js/test/Ice/timeout/Client.js')
-rw-r--r--js/test/Ice/timeout/Client.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/test/Ice/timeout/Client.js b/js/test/Ice/timeout/Client.js
index 62790d63f54..9f2872dfecb 100644
--- a/js/test/Ice/timeout/Client.js
+++ b/js/test/Ice/timeout/Client.js
@@ -142,7 +142,7 @@
connection = con;
return timeout.holdAdapter(1500);
}
- ).then(() => connection.close(false)
+ ).then(() => connection.close(Ice.ConnectionClose.CloseGracefullyAndWait)
).then(() =>
{
try
@@ -163,7 +163,7 @@
}
catch(ex)
{
- test(ex instanceof Ice.CloseConnectionException); // Expected
+ test(ex instanceof Ice.ConnectionManuallyClosedException); // Expected
}
return timeout.op();
}