Allow role lookup with no protocol.

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

diff --git a/saml/saml2/metadata/ObservableMetadataProvider.h b/saml/saml2/metadata/ObservableMetadataProvider.h
index 3de1eb3..91070f9 100644 (file)
--- a/saml/saml2/metadata/ObservableMetadataProvider.h
+++ b/saml/saml2/metadata/ObservableMetadataProvider.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2006 Internet2
+ *  Copyright 2001-2007 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,11 +24,16 @@
 #define __saml2_obsmetadataprov_h__
 
 #include <saml/saml2/metadata/MetadataProvider.h>
+#include <xmltooling/util/Threads.h>
 
 namespace opensaml {
     
     namespace saml2md {
         
+#if defined (_MSC_VER)
+        #pragma warning( push )
+        #pragma warning( disable : 4251 )
+#endif
         /**
          * A metadata provider that notifies interested parties of changes.
          */
@@ -40,18 +45,24 @@ namespace opensaml {
              * 
              * @param e DOM to supply configuration for provider
              */
-            ObservableMetadataProvider(const DOMElement* e=NULL) : MetadataProvider(e) {}
+            ObservableMetadataProvider(const xercesc::DOMElement* e=NULL)
+                : MetadataProvider(e), m_observerLock(xmltooling::Mutex::create()) {
+            }
             
             /**
              * Convenience method for notifying every registered Observer of an event.
              */
-            virtual void emitChangeEvent();
+            virtual void emitChangeEvent() const {
+                xmltooling::Lock lock(m_observerLock);
+                for (std::vector<const Observer*>::const_iterator i=m_observers.begin(); i!=m_observers.end(); i++) {
+                    (*i)->onEvent(*this);
+                }
+            }
 
         public:
-            /**
-             * Destructor will delete any installed filters.
-             */
-            virtual ~ObservableMetadataProvider();
+            virtual ~ObservableMetadataProvider() {
+                delete m_observerLock;
+            }
             
             /**
              * An observer of metadata provider changes.
@@ -69,7 +80,7 @@ namespace opensaml {
                  * 
                  * @param provider the provider being observed
                  */
-                virtual void onEvent(MetadataProvider& provider)=0;
+                virtual void onEvent(const ObservableMetadataProvider& provider) const=0;
             };
             
             /**
@@ -77,18 +88,20 @@ namespace opensaml {
              * 
              * @param newObserver metadata observer to add
              */
-            virtual void addObserver(Observer* newObserver) {
+            virtual void addObserver(const Observer* newObserver) const {
+                xmltooling::Lock lock(m_observerLock);
                 m_observers.push_back(newObserver);
             }
 
             /**
-             * Removes a metadata observer. The caller must delete the observer if necessary.
+             * Removes a metadata observer.
              * 
              * @param oldObserver metadata observer to remove
              * @return  the old observer
              */
-            virtual Observer* removeObserver(Observer* oldObserver) {
-                for (std::vector<Observer*>::iterator i=m_observers.begin(); i!=m_observers.end(); i++) {
+            virtual const Observer* removeObserver(const Observer* oldObserver) const {
+                xmltooling::Lock lock(m_observerLock);
+                for (std::vector<const Observer*>::iterator i=m_observers.begin(); i!=m_observers.end(); i++) {
                     if (oldObserver==(*i)) {
                         m_observers.erase(i);
                         return oldObserver;
@@ -98,8 +111,14 @@ namespace opensaml {
             }
 
         private:
-            std::vector<Observer*> m_observers;
+            mutable xmltooling::Mutex* m_observerLock;
+            mutable std::vector<const Observer*> m_observers;
         };
+
+#if defined (_MSC_VER)
+        #pragma warning( pop )
+#endif
+
     };
 };