Fixed ICE-5486: added support for MessageSizeMax OA property

4 files changed, 27 insertions, 12 deletions

diff --git a/py/test/Ice/exceptions/AllTests.py b/py/test/Ice/exceptions/AllTests.py
index e49b2dfcc9c..1baaa87751c 100644
--- a/py/test/Ice/exceptions/AllTests.py
+++ b/py/test/Ice/exceptions/AllTests.py
@@ -473,13 +473,14 @@ def allTests(communicator):
         print("ok")
 
 
+    if thrower.ice_getConnection():
         sys.stdout.write("testing memory limit marshal exception...");
         sys.stdout.flush();
 
         try:
             thrower.throwMemoryLimitException(array.array('B'));
             test(False)
-        except Ice.UnknownLocalException:
+        except Ice.MemoryLimitException:
             pass
         except:
             print(sys.exc_info())
@@ -488,21 +489,12 @@ def allTests(communicator):
         try:
             thrower.throwMemoryLimitException(bytearray(20 * 1024)) # 20KB
             test(False)
-        except Ice.MemoryLimitException:
-            pass
-        except:
-            test(False)
-
-        try:
-            thrower.end_throwMemoryLimitException(thrower.begin_throwMemoryLimitException(bytearray(20 * 1024))) # 20KB
-            test(False)
-        except Ice.MemoryLimitException:
+        except Ice.ConnectionLostException:
             pass
         except:
             test(False)
 
-    print("ok");
-
+        print("ok");
 
     sys.stdout.write("catching object not exist exception... ")
     sys.stdout.flush()
diff --git a/py/test/Ice/exceptions/Client.py b/py/test/Ice/exceptions/Client.py
index e81016e8f2f..6767e0ddf1d 100755
--- a/py/test/Ice/exceptions/Client.py
+++ b/py/test/Ice/exceptions/Client.py
@@ -28,6 +28,7 @@ try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(sys.argv)
     initData.properties.setProperty("Ice.MessageSizeMax", "10")
+    initData.properties.setProperty("Ice.Warn.Connections", "0");
     communicator = Ice.initialize(sys.argv, initData)
     status = run(sys.argv, communicator)
 except:
diff --git a/py/test/Ice/exceptions/Server.py b/py/test/Ice/exceptions/Server.py
index d1cae6efbe3..a522473ce01 100755
--- a/py/test/Ice/exceptions/Server.py
+++ b/py/test/Ice/exceptions/Server.py
@@ -21,9 +21,15 @@ import Test, TestI
 
 def run(args, communicator):
     adapter = communicator.createObjectAdapter("TestAdapter")
+    adapter2 = communicator.createObjectAdapter("TestAdapter2")
+    adapter3 = communicator.createObjectAdapter("TestAdapter3")
     object = TestI.ThrowerI()
     adapter.add(object, communicator.stringToIdentity("thrower"))
+    adapter2.add(object, communicator.stringToIdentity("thrower"))
+    adapter3.add(object, communicator.stringToIdentity("thrower"))
     adapter.activate()
+    adapter2.activate()
+    adapter3.activate()
     communicator.waitForShutdown()
     return True
 
@@ -31,8 +37,13 @@ try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(sys.argv)
     initData.properties.setProperty("Ice.Warn.Dispatch", "0")
+    initData.properties.setProperty("Ice.Warn.Connections", "0");
     initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
     initData.properties.setProperty("Ice.MessageSizeMax", "10")
+    initData.properties.setProperty("TestAdapter2.Endpoints", "default -p 12011")
+    initData.properties.setProperty("TestAdapter2.MessageSizeMax", "0")
+    initData.properties.setProperty("TestAdapter3.Endpoints", "default -p 12012")
+    initData.properties.setProperty("TestAdapter3.MessageSizeMax", "1")
     communicator = Ice.initialize(sys.argv, initData)
     status = run(sys.argv, communicator)
 except:
diff --git a/py/test/Ice/exceptions/ServerAMD.py b/py/test/Ice/exceptions/ServerAMD.py
index 9dcb283e52b..f1e7562374a 100755
--- a/py/test/Ice/exceptions/ServerAMD.py
+++ b/py/test/Ice/exceptions/ServerAMD.py
@@ -141,9 +141,15 @@ class ThrowerI(Test.Thrower):
 
 def run(args, communicator):
     adapter = communicator.createObjectAdapter("TestAdapter")
+    adapter2 = communicator.createObjectAdapter("TestAdapter2")
+    adapter3 = communicator.createObjectAdapter("TestAdapter3")
     object = ThrowerI()
     adapter.add(object, communicator.stringToIdentity("thrower"))
+    adapter2.add(object, communicator.stringToIdentity("thrower"))
+    adapter3.add(object, communicator.stringToIdentity("thrower"))
     adapter.activate()
+    adapter2.activate()
+    adapter3.activate()
     communicator.waitForShutdown()
     return True
 
@@ -151,8 +157,13 @@ try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(sys.argv)
     initData.properties.setProperty("Ice.Warn.Dispatch", "0")
+    initData.properties.setProperty("Ice.Warn.Connections", "0");
     initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
     initData.properties.setProperty("Ice.MessageSizeMax", "10")
+    initData.properties.setProperty("TestAdapter2.Endpoints", "default -p 12011")
+    initData.properties.setProperty("TestAdapter2.MessageSizeMax", "0")
+    initData.properties.setProperty("TestAdapter3.Endpoints", "default -p 12012")
+    initData.properties.setProperty("TestAdapter3.MessageSizeMax", "1")
     communicator = Ice.initialize(sys.argv, initData)
     status = run(sys.argv, communicator)
 except: