From cb4d5772e9a7a9228577df83027e45ec7de022ea Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Wed, 5 Nov 2014 15:33:01 +0100
Subject: Fixed ICE-5607: relaxed Ice.MessageSizeMax

---
 cpp/test/Ice/exceptions/AllTests.cpp | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

(limited to 'cpp/test/Ice/exceptions/AllTests.cpp')

diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index 36a55f54c49..f03bdab60b5 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -908,6 +908,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         cout << "ok" << endl;
     }
 
+    if(thrower->ice_getConnection())
     {
         cout << "testing memory limit marshal exception..." << flush;
         try
@@ -915,7 +916,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
             thrower->throwMemoryLimitException(Ice::ByteSeq());
             test(false);
         }
-        catch(const Ice::UnknownLocalException&)
+        catch(const Ice::MemoryLimitException&)
         {
         }
         catch(...)
@@ -928,21 +929,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
             thrower->throwMemoryLimitException(Ice::ByteSeq(20 * 1024)); // 20KB
             test(false);
         }
-        catch(const Ice::MemoryLimitException&)
-        {
-        }
-        catch(...)
-        {
-            test(false);
-        }
-            
-        try
-        {
-            thrower->end_throwMemoryLimitException(
-                thrower->begin_throwMemoryLimitException(Ice::ByteSeq(20 * 1024))); // 20KB
-            test(false);
-        }
-        catch(const Ice::MemoryLimitException&)
+        catch(const Ice::ConnectionLostException&)
         {
         }
         catch(...)
-- 
cgit v1.2.3