projects
/
shibboleth
/
cpp-opensaml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c6d4c4b
)
https://issues.shibboleth.net/jira/browse/CPPOST-57
author
Scott Cantor
<cantor.2@osu.edu>
Mon, 15 Nov 2010 22:04:36 +0000
(22:04 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Mon, 15 Nov 2010 22:04:36 +0000
(22:04 +0000)
saml/saml2/metadata/impl/XMLMetadataProvider.cpp
patch
|
blob
|
history
diff --git
a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
index
961cff6
..
57bb4cf
100644
(file)
--- a/
saml/saml2/metadata/impl/XMLMetadataProvider.cpp
+++ b/
saml/saml2/metadata/impl/XMLMetadataProvider.cpp
@@
-36,6
+36,12
@@
#include <xmltooling/util/Threads.h>
#include <xmltooling/validation/ValidatorSuite.h>
#include <xmltooling/util/Threads.h>
#include <xmltooling/validation/ValidatorSuite.h>
+#if defined(OPENSAML_LOG4SHIB)
+# include <log4shib/NDC.hh>
+#elif defined(OPENSAML_LOG4CPP)
+# include <log4cpp/NDC.hh>
+#endif
+
using namespace opensaml::saml2md;
using namespace xmltooling::logging;
using namespace xmltooling;
using namespace opensaml::saml2md;
using namespace xmltooling::logging;
using namespace xmltooling;
@@
-62,13
+68,25
@@
namespace opensaml {
void init() {
try {
void init() {
try {
+ if (!m_id.empty()) {
+ string threadid("[");
+ threadid += m_id + ']';
+ logging::NDC::push(threadid);
+ }
background_load();
startup();
}
catch (...) {
startup();
background_load();
startup();
}
catch (...) {
startup();
+ if (!m_id.empty()) {
+ logging::NDC::pop();
+ }
throw;
}
throw;
}
+
+ if (!m_id.empty()) {
+ logging::NDC::pop();
+ }
}
const XMLObject* getMetadata() const {
}
const XMLObject* getMetadata() const {