Merge pull request #9683 from wddgit/streamModuleDescriptionBug

Bug fix. Fix moduleDescription function
cms-sw · Jun 20, 2015 · 1f0b617 · 1f0b617
2 parents b08ba44 + f0476dc
commit 1f0b617
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/FWCore/Framework/interface/stream/EDAnalyzerAdaptorBase.h b/FWCore/Framework/interface/stream/EDAnalyzerAdaptorBase.h
@@ -78,6 +78,7 @@ namespace edm {
       template<typename T> void createStreamModules(T iFunc) {
         for(auto& m: m_streamModules) {
           m = iFunc();
+          setModuleDescriptionPtr(m);
         }
       }
 
@@ -158,6 +159,7 @@ namespace edm {
                                          ThinnedAssociationsHelper&) { }
 
       // ---------- member data --------------------------------
+      void setModuleDescriptionPtr(EDAnalyzerBase* m);
       void setModuleDescription(ModuleDescription const& md) {
         moduleDescription_ = md;
       }

diff --git a/FWCore/Framework/src/stream/EDAnalyzerAdaptorBase.cc b/FWCore/Framework/src/stream/EDAnalyzerAdaptorBase.cc
@@ -233,3 +233,8 @@ EDAnalyzerAdaptorBase::doPostForkReacquireResources(unsigned int iChildIndex, un
     mod->postForkReacquireResources(iChildIndex,iNumberOfChildren);
   }
 }
+
+void
+EDAnalyzerAdaptorBase::setModuleDescriptionPtr(EDAnalyzerBase* m) {
+  m->setModuleDescriptionPtr(&moduleDescription_);
+}
diff --git a/FWCore/Framework/test/stubs/TestStreamAnalyzers.cc b/FWCore/Framework/test/stubs/TestStreamAnalyzers.cc
@@ -19,11 +19,11 @@ for testing purposes only.
 #include "FWCore/Utilities/interface/GlobalIdentifier.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/TriggerNamesService.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 
-
-
 namespace edmtest {
 namespace stream {
 
@@ -97,6 +97,10 @@ struct Cache {
     }
 
     void analyze(edm::Event const&, edm::EventSetup const&) override {
+      if(moduleDescription().processName() != edm::Service<edm::service::TriggerNamesService>()->getProcessName()) {
+        throw cms::Exception("LogicError")
+          << "module description not properly initialized in stream analyzer";
+      }
       ++m_count;
       ++(runCache()->value);