From f7ed3649e606c31484a0339eb855de0ab0ca6163 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Wed, 1 Sep 2010 16:31:40 +0000
Subject: [PATCH] Ensure reload thread is started up even if init fails.

---
 saml/saml2/metadata/impl/XMLMetadataProvider.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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 {
-- 
2.1.4