diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-08-16 16:47:09 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-08-16 16:47:09 +0200 |
| commit | b01403ed345b99bb63904f5f7eb7b7e1cd32d74c (patch) | |
| tree | ce5edb9684b831f32c686730fac4ec0afed32c8d | |
| parent | Got rid of fixed port in adapterDeactivation test (diff) | |
| download | ice-b01403ed345b99bb63904f5f7eb7b7e1cd32d74c.tar.bz2 ice-b01403ed345b99bb63904f5f7eb7b7e1cd32d74c.tar.xz ice-b01403ed345b99bb63904f5f7eb7b7e1cd32d74c.zip | |
Fix for ICE-8417 - Removed bogus servantLocatorFinished call, also fixed invalid call to invokeException
| -rw-r--r-- | js/src/Ice/ConnectionI.js | 2 | ||||
| -rw-r--r-- | js/src/Ice/IncomingAsync.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/js/src/Ice/ConnectionI.js b/js/src/Ice/ConnectionI.js index 4a7ff409382..7b40227b0eb 100644 --- a/js/src/Ice/ConnectionI.js +++ b/js/src/Ice/ConnectionI.js @@ -1946,7 +1946,7 @@ class ConnectionI // Attempt to log the error and clean up. // this._logger.error("unexpected exception:\n" + ex.toString()); - this.invokeException(requestId, new Ice.UnknownException(ex), invokeNum, false); + this.invokeException(new Ice.UnknownException(ex), invokeNum); } } } diff --git a/js/src/Ice/IncomingAsync.js b/js/src/Ice/IncomingAsync.js index d7f83c3058c..6fb419ce9a9 100644 --- a/js/src/Ice/IncomingAsync.js +++ b/js/src/Ice/IncomingAsync.js @@ -506,7 +506,7 @@ class IncomingAsync { try { - if(this._locator !== null && !this.servantLocatorFinished(amd)) + if(this._locator !== null) { Debug.assert(this._locator !== null && this._servant !== null); try |