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"))
         {