ICE-7333 - Java/C# cross test failure in Ice/optional

4 files changed, 10 insertions, 0 deletions

diff --git a/python/test/Ice/optional/Server.py b/python/test/Ice/optional/Server.py
index c865c37b1c3..7dac81076cd 100755
--- a/python/test/Ice/optional/Server.py
+++ b/python/test/Ice/optional/Server.py
@@ -183,6 +183,9 @@ class InitialI(Test.Initial):
     def supportsCppStringView(self, current=None):
         return False
 
+    def supportsNullOptional(self, current=None):
+        return True
+
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
     adapter = communicator.createObjectAdapter("TestAdapter")
diff --git a/python/test/Ice/optional/ServerAMD.py b/python/test/Ice/optional/ServerAMD.py
index bd95c1feb33..5851064e4d9 100755
--- a/python/test/Ice/optional/ServerAMD.py
+++ b/python/test/Ice/optional/ServerAMD.py
@@ -184,6 +184,9 @@ class InitialI(Test.Initial):
     def supportsCppStringView_async(self, cb, current=None):
         cb.ice_response(False)
 
+    def supportsNullOptional(self, cb, current=None):
+        cb.ice_response(True)
+
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
     adapter = communicator.createObjectAdapter("TestAdapter")
diff --git a/python/test/Ice/optional/Test.ice b/python/test/Ice/optional/Test.ice
index bf98d343436..a4b05fe844a 100644
--- a/python/test/Ice/optional/Test.ice
+++ b/python/test/Ice/optional/Test.ice
@@ -306,6 +306,8 @@ class Initial
     bool supportsCsharpSerializable();
 
     bool supportsCppStringView();
+
+    bool supportsNullOptional();
 };
 
 };
diff --git a/python/test/Ice/optional/TestAMD.ice b/python/test/Ice/optional/TestAMD.ice
index 9ef8436a35e..8f315c90d83 100644
--- a/python/test/Ice/optional/TestAMD.ice
+++ b/python/test/Ice/optional/TestAMD.ice
@@ -307,6 +307,8 @@ class Initial
     bool supportsCsharpSerializable();
 
     bool supportsCppStringView();
+
+    bool supportsNullOptional();
 };
 
 };