From 4058ada173f6e868e70a667078f5a770ae8efa7c Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Wed, 25 Sep 2019 17:26:36 +0200
Subject: Fixed Python bug related to invalid return parameters, fixes #550

---
 cpp/test/Ice/servantLocator/ServantLocatorI.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'cpp/test')

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")
     {
-- 
cgit v1.2.3