diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-11-05 15:33:01 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-11-05 15:33:01 +0100 |
| commit | cb4d5772e9a7a9228577df83027e45ec7de022ea (patch) | |
| tree | bd6489fe77ed5fba43adff613293d580fda8e0f3 /cpp/test/Ice/exceptions/AllTests.cpp | |
| parent | Fixed src tree build of IceJS (diff) | |
| download | ice-cb4d5772e9a7a9228577df83027e45ec7de022ea.tar.bz2 ice-cb4d5772e9a7a9228577df83027e45ec7de022ea.tar.xz ice-cb4d5772e9a7a9228577df83027e45ec7de022ea.zip | |
Fixed ICE-5607: relaxed Ice.MessageSizeMax
Diffstat (limited to 'cpp/test/Ice/exceptions/AllTests.cpp')
| -rw-r--r-- | cpp/test/Ice/exceptions/AllTests.cpp | 19 |
1 files changed, 3 insertions, 16 deletions
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(...) |