Merge pull request #43595 from wddgit/fixExitCode132X

Fix bug related to cmsRun exit code with FileReadError, 13_2_X backport
cms-sw · Dec 19, 2023 · 334bb70 · 334bb70
2 parents 324e582 + ec4cfb8
commit 334bb70
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/FWCore/Framework/src/ProductResolvers.cc b/FWCore/Framework/src/ProductResolvers.cc
@@ -159,13 +159,12 @@ namespace edm {
   }
 
   namespace {
-    cms::Exception& extendException(cms::Exception& e, BranchDescription const& bd, ModuleCallingContext const* mcc) {
+    void extendException(cms::Exception& e, BranchDescription const& bd, ModuleCallingContext const* mcc) {
       e.addContext(std::string("While reading from source ") + bd.className() + " " + bd.moduleLabel() + " '" +
                    bd.productInstanceName() + "' " + bd.processName());
       if (mcc) {
         edm::exceptionContext(e, *mcc);
       }
-      return e;
     }
   }  // namespace
   ProductResolverBase::Resolution DelayedReaderInputProductResolver::resolveProduct_(
@@ -197,10 +196,12 @@ namespace edm {
             //another thread could have beaten us here
             setProduct(reader->getProduct(branchDescription().branchID(), &principal, mcc));
           } catch (cms::Exception& e) {
-            throw extendException(e, branchDescription(), mcc);
+            extendException(e, branchDescription(), mcc);
+            throw;
           } catch (std::exception const& e) {
             auto newExcept = edm::Exception(errors::StdException) << e.what();
-            throw extendException(newExcept, branchDescription(), mcc);
+            extendException(newExcept, branchDescription(), mcc);
+            throw newExcept;
           }
         }
       }
@@ -299,10 +300,12 @@ namespace edm {
                   //another thread could have finished this while we were waiting
                   setProduct(reader->getProduct(branchDescription().branchID(), &principal, mcc));
                 } catch (cms::Exception& e) {
-                  throw extendException(e, branchDescription(), mcc);
+                  extendException(e, branchDescription(), mcc);
+                  throw;
                 } catch (std::exception const& e) {
                   auto newExcept = edm::Exception(errors::StdException) << e.what();
-                  throw extendException(newExcept, branchDescription(), mcc);
+                  extendException(newExcept, branchDescription(), mcc);
+                  throw newExcept;
                 }
               }
             }