summaryrefslogtreecommitdiff
path: root/js/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-10-16 00:56:00 +0200
committerJose <jose@zeroc.com>2018-10-16 00:56:00 +0200
commit1cf1372d13f0e457bdf615df0de060995790d07e (patch)
tree65d50379d5cacb4de14e287d9b03d353232923ec /js/src
parentTypescript support (diff)
downloadice-1cf1372d13f0e457bdf615df0de060995790d07e.tar.bz2
ice-1cf1372d13f0e457bdf615df0de060995790d07e.tar.xz
ice-1cf1372d13f0e457bdf615df0de060995790d07e.zip
Fix handling of ServantError
Close #245
Diffstat (limited to 'js/src')
-rw-r--r--js/src/Ice/ConnectionI.js4
-rw-r--r--js/src/Ice/Exception.js11
-rw-r--r--js/src/Ice/IncomingAsync.js5
3 files changed, 0 insertions, 20 deletions
diff --git a/js/src/Ice/ConnectionI.js b/js/src/Ice/ConnectionI.js
index d5a9ae8cfed..9c7ac5df77f 100644
--- a/js/src/Ice/ConnectionI.js
+++ b/js/src/Ice/ConnectionI.js
@@ -1942,10 +1942,6 @@ class ConnectionI
{
this.invokeException(ex, invokeNum);
}
- else if(ex instanceof Ice.ServantError)
- {
- // Ignore
- }
else
{
//
diff --git a/js/src/Ice/Exception.js b/js/src/Ice/Exception.js
index 162b28a7622..dddabd88cd2 100644
--- a/js/src/Ice/Exception.js
+++ b/js/src/Ice/Exception.js
@@ -51,17 +51,6 @@ const toString = function(key, object, objectTable, ident)
return s;
};
-class ServantError extends Error
-{
- constructor(cause)
- {
- super();
- this.cause = cause;
- }
-}
-
-Ice.ServantError = ServantError;
-
//
// Ice.Exception
//
diff --git a/js/src/Ice/IncomingAsync.js b/js/src/Ice/IncomingAsync.js
index 39cc2faa94e..86e785b0531 100644
--- a/js/src/Ice/IncomingAsync.js
+++ b/js/src/Ice/IncomingAsync.js
@@ -349,11 +349,6 @@ class IncomingAsync
{
this._connection.sendNoResponse();
}
-
- if(!amd)
- {
- throw new Ice.ServantError(ex);
- }
}
this._connection = null;