Improvements based on review

- removed unnecessary includes
- removed redundant checks
- fixed comments

Author: Dr15Jones

FWCore/Framework/interface/ModuleRegistryUtilities.h

@@ -39,7 +39,7 @@ namespace edm {
 
   /** beginStreamFailedForModule holds module id for each module which threw an exception during
      * the call to beginStream function. This vector is used to determine which modules should not
-     * have their endStream called. The vector should be passed to `runEndJobForModules`.
+     * have their endStream called. The vector should be passed to `runEndStreamForModules`.
      * If an exception is thrown, it will be of type cms::Exception.
      */
   void runBeginStreamForModules(StreamContext const& iStreamContext,
@@ -53,7 +53,7 @@ namespace edm {
                               ActivityRegistry& iRegistry,
                               ExceptionCollector& collector,
                               std::mutex& collectorMutex,
-                              std::vector<unsigned int> const& beginJobFailedForModule) noexcept;
+                              std::vector<unsigned int> const& beginStreamFailedForModule) noexcept;
 
 }  // namespace edm
-#endif  // FWCore_Framework_ModuleRegistryUtilities_h
+#endif  // FWCore_Framework_ModuleRegistryUtilities_h

FWCore/Framework/src/GlobalSchedule.cc

@@ -103,10 +103,8 @@ namespace edm {
       try {
         runBeginJobForModules(gc, modReg, *actReg_, beginJobFailedForModule_);
       } catch (cms::Exception& ex) {
-        if (!exceptionPtr) {
-          ex.addContext(globalContext);
-          exceptionPtr = std::current_exception();
-        }
+        ex.addContext(globalContext);
+        exceptionPtr = std::current_exception();
       }
     }
     try {

FWCore/Framework/src/Schedule.cc

@@ -34,7 +34,6 @@
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
 #include "FWCore/ServiceRegistry/interface/ModuleConsumesInfo.h"
-#include "FWCore/ServiceRegistry/interface/ProcessContext.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
 #include "FWCore/Utilities/interface/ConvertException.h"
 #include "FWCore/Utilities/interface/ExceptionCollector.h"