summaryrefslogtreecommitdiff
path: root/csharp/test
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 /csharp/test
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 'csharp/test')
-rw-r--r--csharp/test/Ice/servantLocator/ServantLocatorAMDI.cs6
-rw-r--r--csharp/test/Ice/servantLocator/ServantLocatorI.cs6
2 files changed, 12 insertions, 0 deletions
diff --git a/csharp/test/Ice/servantLocator/ServantLocatorAMDI.cs b/csharp/test/Ice/servantLocator/ServantLocatorAMDI.cs
index d67230a694d..e56c84f7525 100644
--- a/csharp/test/Ice/servantLocator/ServantLocatorAMDI.cs
+++ b/csharp/test/Ice/servantLocator/ServantLocatorAMDI.cs
@@ -50,6 +50,12 @@ namespace Ice
return null;
}
+ if(current.id.name.Equals("invalidReturnValue") || current.id.name.Equals("invalidReturnType"))
+ {
+ cookie = null;
+ return null;
+ }
+
test(current.id.name.Equals("locate") || current.id.name.Equals("finished"));
if(current.id.name.Equals("locate"))
{
diff --git a/csharp/test/Ice/servantLocator/ServantLocatorI.cs b/csharp/test/Ice/servantLocator/ServantLocatorI.cs
index 4cdc5b96b2b..6e0708546ff 100644
--- a/csharp/test/Ice/servantLocator/ServantLocatorI.cs
+++ b/csharp/test/Ice/servantLocator/ServantLocatorI.cs
@@ -48,6 +48,12 @@ namespace Ice
return null;
}
+ if(current.id.name.Equals("invalidReturnValue") || current.id.name.Equals("invalidReturnType"))
+ {
+ cookie = null;
+ return null;
+ }
+
test(current.id.name.Equals("locate") || current.id.name.Equals("finished"));
if(current.id.name.Equals("locate"))
{