QPID-3787 - Fixed shutdown crash in SslPlugin, Fixed problem with sasl_mux test.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1236864 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 1 deletions

diff --git a/cpp/src/qpid/sys/SslPlugin.cpp b/cpp/src/qpid/sys/SslPlugin.cpp
index ab15785492..48baef9042 100644
--- a/cpp/src/qpid/sys/SslPlugin.cpp
+++ b/cpp/src/qpid/sys/SslPlugin.cpp
@@ -96,10 +96,12 @@ typedef SslProtocolFactoryTmpl<SslMuxSocket> SslMuxProtocolFactory;
 // Static instance to initialise plugin
 static struct SslPlugin : public Plugin {
     SslServerOptions options;
+    bool nssInitialized;
 
     Options* getOptions() { return &options; }
 
-    ~SslPlugin() { ssl::shutdownNSS(); }
+    SslPlugin() : nssInitialized(false) {}
+    ~SslPlugin() { if (nssInitialized) ssl::shutdownNSS(); }
 
     void earlyInitialize(Target& target) {
         broker::Broker* broker = dynamic_cast<broker::Broker*>(&target);
@@ -129,6 +131,7 @@ static struct SslPlugin : public Plugin {
             } else {
                 try {
                     ssl::initNSS(options, true);
+                    nssInitialized = true;
                     
                     const broker::Broker::Options& opts = broker->getOptions();