From 0558e088c7d14ff6cf8ff531f30c607a46e6104b Mon Sep 17 00:00:00 2001 From: Marc Laukien Date: Wed, 11 Sep 2002 12:09:20 +0000 Subject: fixed retry bug --- cpp/src/Ice/ThreadPool.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'cpp/src/Ice/ThreadPool.cpp') diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 60d75341c32..d09c86fbe58 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -55,6 +55,10 @@ IceInternal::ThreadPool::promoteFollower() void IceInternal::ThreadPool::initiateShutdown() { + // + // This operation must be signal safe, so all we can do is to set + // an interrupt. + // setInterrupt(1); } @@ -262,7 +266,13 @@ IceInternal::ThreadPool::run() repeatSelect: - if(shutdown) // Shutdown has been initiated. + // + // We must shut down the object adapter factory. We cannot do + // this in initiateShutdown(), because this method must be + // signal safe. We also cannot do this within the + // synchronization of this object, so we do it here. + // + if(shutdown) { shutdown = false; ObjectAdapterFactoryPtr factory = _instance->objectAdapterFactory(); -- cgit v1.2.3