boost changes and header fixes

[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..3f0c7b1 100644 (file)
--- a/saml/saml2/metadata/impl/ObservableMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/ObservableMetadataProvider.cpp
@@ -1,17 +1,21 @@
-/*
- *  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.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
@@ -23,17 +27,50 @@
 #include "internal.h"
 #include "saml2/metadata/ObservableMetadataProvider.h"
 
+#include <boost/bind.hpp>
+#include <xmltooling/util/Threads.h>
+
 using namespace opensaml::saml2md;
+using namespace xmltooling;
+using namespace boost;
 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>());
 }
 
-void ObservableMetadataProvider::emitChangeEvent()
+void ObservableMetadataProvider::emitChangeEvent() const
+{
+    Lock lock(m_observerLock.get());
+    for_each(m_observers.begin(), m_observers.end(), boost::bind(&Observer::onEvent, _1, boost::ref(*this)));
+}
+
+void ObservableMetadataProvider::addObserver(const Observer* newObserver) const
 {
-    for (std::vector<Observer*>::const_iterator i=m_observers.begin(); i!=m_observers.end(); i++) {
-        (*i)->onEvent(*this);
+    Lock lock(m_observerLock.get());
+    m_observers.push_back(newObserver);
+}
+
+const ObservableMetadataProvider::Observer* ObservableMetadataProvider::removeObserver(const Observer* oldObserver) const
+{
+    Lock lock(m_observerLock.get());
+    vector<const Observer*>::iterator i = find(m_observers.begin(), m_observers.end(), oldObserver);
+    if (i != m_observers.end()) {
+        m_observers.erase(i);
+        return oldObserver;
     }
+    return nullptr;
+}
+
+ObservableMetadataProvider::Observer::Observer()
+{
+}
+
+ObservableMetadataProvider::Observer::~Observer()
+{
 }