Merge pull request #11050 from fwyzard/DQMStore_removeElement_do_not_…

…remove_non-existing_MEs DQMStore::removeElement: do not remove non-existing MEs
cms-sw · Sep 3, 2015 · c01403e · c01403e
2 parents 7f9ec74 + c85b9c9
commit c01403e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/DQMServices/Core/src/DQMStore.cc b/DQMServices/Core/src/DQMStore.cc
@@ -3221,11 +3221,11 @@ DQMStore::removeElement(const std::string &dir, const std::string &name, bool wa
 {
   MonitorElement proto(&dir, name);
   MEMap::iterator pos = data_.find(proto);
-  if (pos == data_.end() && warning)
+  if (pos != data_.end())
+    data_.erase(pos);
+  else if (warning)
     std::cout << "DQMStore: WARNING: attempt to remove non-existent"
               << " monitor element '" << name << "' in '" << dir << "'\n";
-  else
-    data_.erase(pos);
 }
 
 //////////////////////////////////////////////////////////////////////