Invalidate pset registration if needed

cms-sw · Jan 15, 2015 · 159bad4 · 159bad4
1 parent 91f7356
commit 159bad4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/FWCore/ParameterSet/interface/ParameterSet.h b/FWCore/ParameterSet/interface/ParameterSet.h
@@ -34,6 +34,7 @@ namespace edm {
 
   class ParameterSet {
   public:
+    template<typename T> friend class ParameterDescription;
     enum Bool {
       False = 0,
       True = 1,

diff --git a/FWCore/ParameterSet/src/ParameterDescription.cc b/FWCore/ParameterSet/src/ParameterDescription.cc
@@ -71,6 +71,9 @@ namespace edm {
     exists = pset.existsAs<ParameterSet>(label(), isTracked());
 
     if(exists) {
+      if(pset.isRegistered()) {
+         pset.invalidateRegistration("");
+      }
       ParameterSet * containedPSet = pset.getPSetForUpdate(label());
       psetDesc_->validate(*containedPSet);
     }