diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2019-09-25 17:26:36 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2019-09-25 17:46:22 +0200 |
| commit | 4058ada173f6e868e70a667078f5a770ae8efa7c (patch) | |
| tree | 5ecc854afb72d695589e83df666a080a58681ad9 /java-compat | |
| parent | Update .NET Core default target framework to .netcoreapp3.0 (diff) | |
| download | ice-4058ada173f6e868e70a667078f5a770ae8efa7c.tar.bz2 ice-4058ada173f6e868e70a667078f5a770ae8efa7c.tar.xz ice-4058ada173f6e868e70a667078f5a770ae8efa7c.zip | |
Fixed Python bug related to invalid return parameters, fixes #550
Diffstat (limited to 'java-compat')
| -rw-r--r-- | java-compat/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java | 5 | ||||
| -rw-r--r-- | java-compat/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/java-compat/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java b/java-compat/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java index accd91b9fa7..0f131ffffee 100644 --- a/java-compat/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java +++ b/java-compat/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java @@ -57,6 +57,11 @@ public final class AMDServantLocatorI implements Ice.ServantLocator return null; } + if(current.id.name.equals("invalidReturnValue") || current.id.name.equals("invalidReturnType")) + { + return null; + } + test(current.id.name.equals("locate") || current.id.name.equals("finished")); if(current.id.name.equals("locate")) { diff --git a/java-compat/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java b/java-compat/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java index 8dfb7665841..7ac1f491cdb 100644 --- a/java-compat/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java +++ b/java-compat/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java @@ -57,6 +57,11 @@ public final class ServantLocatorI implements Ice.ServantLocator return null; } + if(current.id.name.equals("invalidReturnValue") || current.id.name.equals("invalidReturnType")) + { + return null; + } + test(current.id.name.equals("locate") || current.id.name.equals("finished")); if(current.id.name.equals("locate")) { |