Fixed ICE-5486: added support for MessageSizeMax OA property

3 files changed, 41 insertions, 1 deletions

diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index f03bdab60b5..13845097f8b 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -932,10 +932,30 @@ allTests(const Ice::CommunicatorPtr& communicator)
         catch(const Ice::ConnectionLostException&)
         {
         }
-        catch(...)
+        catch(const Ice::LocalException& ex)
+        {
+            cerr << ex << endl;
+            test(false);
+        }
+        
+        ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(communicator->stringToProxy("thrower:default -p 12011"));
+        try
+        {
+            thrower2->throwMemoryLimitException(Ice::ByteSeq(2 * 1024 * 1024)); // 2MB (no limits)
+        }
+        catch(const Ice::MemoryLimitException&)
+        {
+        }
+        ThrowerPrx thrower3 = ThrowerPrx::uncheckedCast(communicator->stringToProxy("thrower:default -p 12012"));
+        try
         {
+            thrower3->throwMemoryLimitException(Ice::ByteSeq(1024)); // 1KB limit
             test(false);
         }
+        catch(const Ice::ConnectionLostException&)
+        {
+        }
+
         cout << "ok" << endl;
     }
 
diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp
index d50ffc78dd6..32706ccaf8b 100644
--- a/cpp/test/Ice/exceptions/Server.cpp
+++ b/cpp/test/Ice/exceptions/Server.cpp
@@ -19,9 +19,15 @@ int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
+    Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter2");
+    Ice::ObjectAdapterPtr adapter3 = communicator->createObjectAdapter("TestAdapter3");
     Ice::ObjectPtr object = new 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();
     TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
@@ -41,6 +47,10 @@ main(int argc, char* argv[])
         initData.properties->setProperty("Ice.Warn.Connections", "0");
         initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
         initData.properties->setProperty("Ice.MessageSizeMax", "10"); // 10KB max
+        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(argc, argv, initData);
         status = run(argc, argv, communicator);
     }
diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp
index 04f4d5805bc..75de52d1efb 100644
--- a/cpp/test/Ice/exceptions/ServerAMD.cpp
+++ b/cpp/test/Ice/exceptions/ServerAMD.cpp
@@ -19,9 +19,15 @@ int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
+    Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter2");
+    Ice::ObjectAdapterPtr adapter3 = communicator->createObjectAdapter("TestAdapter3");
     Ice::ObjectPtr object = new 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();
     TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
@@ -41,6 +47,10 @@ main(int argc, char* argv[])
         initData.properties->setProperty("Ice.Warn.Connections", "0");
         initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
         initData.properties->setProperty("Ice.MessageSizeMax", "10"); // 10KB max
+        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(argc, argv, initData);
         status = run(argc, argv, communicator);
     }