summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-09-16 15:15:20 +0200
committerBenoit Foucher <benoit@zeroc.com>2016-09-16 15:15:20 +0200
commit682c207665523731c3f64fcd83551a846dc11477 (patch)
treeb8e88267710c4d48d2c5b848b86a8e1bbd758c62 /js
parentRemoved double About on OS X (diff)
downloadice-682c207665523731c3f64fcd83551a846dc11477.tar.bz2
ice-682c207665523731c3f64fcd83551a846dc11477.tar.xz
ice-682c207665523731c3f64fcd83551a846dc11477.zip
Fix for ICE-7357 - catch exceptions raised by connection getInfo
Diffstat (limited to 'js')
-rw-r--r--js/src/Ice/IncomingAsync.js15
1 files changed, 11 insertions, 4 deletions
diff --git a/js/src/Ice/IncomingAsync.js b/js/src/Ice/IncomingAsync.js
index eee2a0121a6..0464dcede09 100644
--- a/js/src/Ice/IncomingAsync.js
+++ b/js/src/Ice/IncomingAsync.js
@@ -141,11 +141,18 @@ var IncomingAsync = Ice.Class({
s.push("\noperation: " + this._current.operation);
if(this._connection !== null)
{
- var connInfo = this._connection.getInfo();
- if(connInfo instanceof Ice.IPConnectionInfo)
+ try
{
- var ipConnInfo = connInfo;
- s.push("\nremote host: " + ipConnInfo.remoteAddress + " remote port: " + ipConnInfo.remotePort);
+ var connInfo = this._connection.getInfo();
+ if(connInfo instanceof Ice.IPConnectionInfo)
+ {
+ var ipConnInfo = connInfo;
+ s.push("\nremote host: " + ipConnInfo.remoteAddress + " remote port: " + ipConnInfo.remotePort);
+ }
+ }
+ catch(exc)
+ {
+ // Ignore.
}
}
if(ex.stack)