Reducing header overuse, non-inlining selected methods (CPPOST-35).

[shibboleth/cpp-opensaml.git] / saml / saml2 / metadata / impl / ObservableMetadataProvider.cpp

diff --git a/saml/saml2/metadata/impl/ObservableMetadataProvider.cpp b/saml/saml2/metadata/impl/ObservableMetadataProvider.cpp
index a64af43..aa6d94b 100644 (file)
--- a/saml/saml2/metadata/impl/ObservableMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/ObservableMetadataProvider.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2009 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,17 +23,52 @@
 #include "internal.h"
 #include "saml2/metadata/ObservableMetadataProvider.h"
 
+#include <xmltooling/util/Threads.h>
+
 using namespace opensaml::saml2md;
+using namespace xmltooling;
 using namespace std;
 
+ObservableMetadataProvider::ObservableMetadataProvider(const xercesc::DOMElement* e)
+    : MetadataProvider(e), m_observerLock(Mutex::create())
+{
+}
+
 ObservableMetadataProvider::~ObservableMetadataProvider()
 {
-    for_each(m_observers.begin(),m_observers.end(),xmltooling::cleanup<Observer>());
+    delete m_observerLock;
 }
 
-void ObservableMetadataProvider::emitChangeEvent()
+void ObservableMetadataProvider::emitChangeEvent() const
 {
-    for (std::vector<Observer*>::const_iterator i=m_observers.begin(); i!=m_observers.end(); i++) {
+    Lock lock(m_observerLock);
+    for (vector<const Observer*>::const_iterator i=m_observers.begin(); i!=m_observers.end(); i++) {
         (*i)->onEvent(*this);
     }
 }
+
+void ObservableMetadataProvider::addObserver(const Observer* newObserver) const
+{
+    Lock lock(m_observerLock);
+    m_observers.push_back(newObserver);
+}
+
+const ObservableMetadataProvider::Observer* ObservableMetadataProvider::removeObserver(const Observer* oldObserver) const
+{
+    Lock lock(m_observerLock);
+    for (vector<const Observer*>::iterator i=m_observers.begin(); i!=m_observers.end(); i++) {
+        if (oldObserver==(*i)) {
+            m_observers.erase(i);
+            return oldObserver;
+        }
+    }
+    return NULL;
+}
+
+ObservableMetadataProvider::Observer::Observer()
+{
+}
+
+ObservableMetadataProvider::Observer::~Observer()
+{
+}