From 24bc094cb149e283ab948335ecdfc06af4e93672 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Fri, 29 Mar 2013 10:16:01 -0700 Subject: [PATCH] Fix a rare bug on shutdown. --- src/cpp/ripple/InstanceCounter.h | 5 +++++ src/cpp/ripple/main.cpp | 1 + 2 files changed, 6 insertions(+) diff --git a/src/cpp/ripple/InstanceCounter.h b/src/cpp/ripple/InstanceCounter.h index 95301cbbf..5a8fe1c61 100644 --- a/src/cpp/ripple/InstanceCounter.h +++ b/src/cpp/ripple/InstanceCounter.h @@ -50,6 +50,11 @@ public: sMultiThreaded = true; } + static void shutdown() + { + sMultiThreaded = false; + } + static bool isMultiThread() { return sMultiThreaded; diff --git a/src/cpp/ripple/main.cpp b/src/cpp/ripple/main.cpp index 51852d96a..239d8301a 100644 --- a/src/cpp/ripple/main.cpp +++ b/src/cpp/ripple/main.cpp @@ -265,6 +265,7 @@ int main(int argc, char* argv[]) setupServer(); NameThread("io"); startServer(); + InstanceType::shutdown(); } else {