summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2019-09-25 17:26:36 +0200
committerBenoit Foucher <benoit@zeroc.com>2019-09-25 17:46:22 +0200
commit4058ada173f6e868e70a667078f5a770ae8efa7c (patch)
tree5ecc854afb72d695589e83df666a080a58681ad9 /cpp
parentUpdate .NET Core default target framework to .netcoreapp3.0 (diff)
downloadice-4058ada173f6e868e70a667078f5a770ae8efa7c.tar.bz2
ice-4058ada173f6e868e70a667078f5a770ae8efa7c.tar.xz
ice-4058ada173f6e868e70a667078f5a770ae8efa7c.zip
Fixed Python bug related to invalid return parameters, fixes #550
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/Ice/servantLocator/ServantLocatorI.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/cpp/test/Ice/servantLocator/ServantLocatorI.cpp b/cpp/test/Ice/servantLocator/ServantLocatorI.cpp
index 2282aaca474..752b55ad044 100644
--- a/cpp/test/Ice/servantLocator/ServantLocatorI.cpp
+++ b/cpp/test/Ice/servantLocator/ServantLocatorI.cpp
@@ -43,6 +43,11 @@ ServantLocatorI::locate(const Ice::Current& current, Ice::LocalObjectPtr& cookie
return 0;
}
+ if(current.id.name == "invalidReturnValue" || current.id.name == "invalidReturnType")
+ {
+ return 0;
+ }
+
test(current.id.name == "locate" || current.id.name == "finished");
if(current.id.name == "locate")
{