summaryrefslogtreecommitdiff
path: root/cpp/src/Glacier2Lib/SessionHelper.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-05-23 18:47:34 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-05-23 18:47:34 +0200
commit0593db2ff6438f0c259144822c6f0ada1f7b79df (patch)
tree8400faa0d5bbdd95fcfe03fb9adfb8e117f9da07 /cpp/src/Glacier2Lib/SessionHelper.cpp
parentFix whitespace (diff)
downloadice-0593db2ff6438f0c259144822c6f0ada1f7b79df.tar.bz2
ice-0593db2ff6438f0c259144822c6f0ada1f7b79df.tar.xz
ice-0593db2ff6438f0c259144822c6f0ada1f7b79df.zip
Fixed ICE-7884 - TwowayOnlyException is now raised for twoway invocations on oneway proxies
Diffstat (limited to 'cpp/src/Glacier2Lib/SessionHelper.cpp')
-rw-r--r--cpp/src/Glacier2Lib/SessionHelper.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
index 3891e31ab7f..b5d436c7503 100644
--- a/cpp/src/Glacier2Lib/SessionHelper.cpp
+++ b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -1041,7 +1041,11 @@ Glacier2::SessionFactoryHelper::setProtocol(const string& protocol)
protocol != "ws" &&
protocol != "wss")
{
+#ifdef ICE_CPP11_MAPPING
+ throw invalid_argument("Unknown protocol `" + protocol + "'");
+#else
throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Unknown protocol `" + protocol + "'");
+#endif
}
_protocol = protocol;
}