diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-09-08 17:01:10 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-09-08 17:01:10 +0200 |
| commit | 0df6f42a702bcc634cd3897fc21e38e05ef26fab (patch) | |
| tree | 31ca325166b9d3b7adec37d9e9b7d06a03622b77 /objective-c | |
| parent | Fixed ICE-6778 - background test failure (diff) | |
| download | ice-0df6f42a702bcc634cd3897fc21e38e05ef26fab.tar.bz2 ice-0df6f42a702bcc634cd3897fc21e38e05ef26fab.tar.xz ice-0df6f42a702bcc634cd3897fc21e38e05ef26fab.zip | |
Fix for TCH-259 - assert on shutdown
Diffstat (limited to 'objective-c')
| -rw-r--r-- | objective-c/test/Common/TestCommon.m | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/objective-c/test/Common/TestCommon.m b/objective-c/test/Common/TestCommon.m index a0e2925c4fe..d2b5b9b4437 100644 --- a/objective-c/test/Common/TestCommon.m +++ b/objective-c/test/Common/TestCommon.m @@ -187,7 +187,14 @@ serverReady(id<ICECommunicator> c) void serverStop() { - [communicator shutdown]; + @try + { + [communicator shutdown]; + } + @catch(ICECommunicatorDestroyedException* ex) + { + // Ignore, it's possible the test shutdown the server explicitly already. + } } void |