summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/gc/Client.cpp
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2003-10-24 02:46:29 +0000
committerMichi Henning <michi@zeroc.com>2003-10-24 02:46:29 +0000
commit0b06f964e9f1e741128e34675a57af4fb76a405e (patch)
treeaffdf7747a0c184a8033ff05e1ec05e24ad44bb4 /cpp/test/Ice/gc/Client.cpp
parentadding support for renaming types (diff)
downloadice-0b06f964e9f1e741128e34675a57af4fb76a405e.tar.bz2
ice-0b06f964e9f1e741128e34675a57af4fb76a405e.tar.xz
ice-0b06f964e9f1e741128e34675a57af4fb76a405e.zip
Fixed shutdown race.
Diffstat (limited to 'cpp/test/Ice/gc/Client.cpp')
-rw-r--r--cpp/test/Ice/gc/Client.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/cpp/test/Ice/gc/Client.cpp b/cpp/test/Ice/gc/Client.cpp
index fb1b42ce038..b05f9b7c84f 100644
--- a/cpp/test/Ice/gc/Client.cpp
+++ b/cpp/test/Ice/gc/Client.cpp
@@ -491,7 +491,7 @@ MyApplication::run(int argc, char* argv[])
{
if(interrupted())
{
- return EXIT_SUCCESS;
+ break;
}
garbageThread->randomWait();
Ice::collectGarbage();
@@ -500,9 +500,15 @@ MyApplication::run(int argc, char* argv[])
garbageThread->stop();
Ice::collectGarbage();
test(num == 0);
- cout << "ok" << endl;
-
- return EXIT_SUCCESS;
+ if(!interrupted())
+ {
+ cout << "ok" << endl;
+ return EXIT_SUCCESS;
+ }
+ else
+ {
+ return 130; // SIGINT + 128
+ }
}
int