[cpp-xmltooling] branch master updated: SSPCPP-684 Fix leaking files.

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-xmltooling.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-xmltooling.git;a=commit;h=93e8237037fc10ac152b8140bb26a13337a81a85

The following commit(s) were added to refs/heads/master by this push:
       new  93e8237   SSPCPP-684 Fix leaking files.
93e8237 is described below

commit 93e8237037fc10ac152b8140bb26a13337a81a85
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jun 16 17:01:09 2016 +0100

    SSPCPP-684 Fix leaking files.
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-684
    
    We need to catch the 304 return from curl and delete the spool file.
---
 xmltooling/util/ReloadableXMLFile.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xmltooling/util/ReloadableXMLFile.cpp b/xmltooling/util/ReloadableXMLFile.cpp
index 1b005f6..7505616 100644
--- a/xmltooling/util/ReloadableXMLFile.cpp
+++ b/xmltooling/util/ReloadableXMLFile.cpp
@@ -476,6 +476,11 @@ pair<bool,DOMElement*> ReloadableXMLFile::load(bool backup, string backingFile)
             remove(backingFile.c_str());
         throw;
     }
+    catch (long& ex) {
+        if (!backingFile.empty() && !backup)
+            remove(backingFile.c_str());
+        throw;
+    }
 }
 
 pair<bool,DOMElement*> ReloadableXMLFile::load()

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.