summaryrefslogtreecommitdiff
path: root/py/modules/IcePy/Proxy.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2014-08-19 13:10:29 -0230
committerDwayne Boone <dwayne@zeroc.com>2014-08-19 13:10:29 -0230
commitc6d20e1e1afc75f8bd889c093ccbffb247ec30cb (patch)
tree19443a7e7263ce1d715dad261b4574942c419552 /py/modules/IcePy/Proxy.cpp
parentFixed (ICE-5592) - Add IceSSL.FindCert for OS X and Windows (diff)
downloadice-c6d20e1e1afc75f8bd889c093ccbffb247ec30cb.tar.bz2
ice-c6d20e1e1afc75f8bd889c093ccbffb247ec30cb.tar.xz
ice-c6d20e1e1afc75f8bd889c093ccbffb247ec30cb.zip
ICE-3492 handle improper settings for timeout values
Diffstat (limited to 'py/modules/IcePy/Proxy.cpp')
-rw-r--r--py/modules/IcePy/Proxy.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/py/modules/IcePy/Proxy.cpp b/py/modules/IcePy/Proxy.cpp
index e0f61858496..90cf02923b7 100644
--- a/py/modules/IcePy/Proxy.cpp
+++ b/py/modules/IcePy/Proxy.cpp
@@ -827,6 +827,11 @@ proxyIceLocatorCacheTimeout(ProxyObject* self, PyObject* args)
{
newProxy = (*self->proxy)->ice_locatorCacheTimeout(timeout);
}
+ catch(const IceUtil::IllegalArgumentException& ex)
+ {
+ PyErr_Format(PyExc_RuntimeError, "%s", STRCAST(ex.reason().c_str()));
+ return 0;
+ }
catch(const Ice::Exception& ex)
{
setPythonException(ex);
@@ -855,6 +860,11 @@ proxyIceInvocationTimeout(ProxyObject* self, PyObject* args)
{
newProxy = (*self->proxy)->ice_invocationTimeout(timeout);
}
+ catch(const IceUtil::IllegalArgumentException& ex)
+ {
+ PyErr_Format(PyExc_RuntimeError, "%s", STRCAST(ex.reason().c_str()));
+ return 0;
+ }
catch(const Ice::Exception& ex)
{
setPythonException(ex);
@@ -1586,6 +1596,11 @@ proxyIceTimeout(ProxyObject* self, PyObject* args)
{
newProxy = (*self->proxy)->ice_timeout(timeout);
}
+ catch(const IceUtil::IllegalArgumentException& ex)
+ {
+ PyErr_Format(PyExc_RuntimeError, "%s", STRCAST(ex.reason().c_str()));
+ return 0;
+ }
catch(const Ice::Exception& ex)
{
setPythonException(ex);