From: Scott Cantor <cantor.2@osu.edu>
Date: Wed, 1 Sep 2010 16:31:40 +0000 (+0000)
Subject: Ensure reload thread is started up even if init fails.
X-Git-Tag: 2.4RC1~39
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=commitdiff_plain;h=f7ed3649e606c31484a0339eb855de0ab0ca6163

Ensure reload thread is started up even if init fails.
---

diff --git a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
index ff726e9..df85913 100644
--- a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
@@ -57,8 +57,14 @@ namespace opensaml {
             }
 
             void init() {
-                background_load();
-                startup();
+                try {
+                    background_load();
+                    startup();
+                }
+                catch (...) {
+                    startup();
+                    throw;
+                }
             }
 
             const XMLObject* getMetadata() const {