Merge pull request cms-sw#1906 from fwyzard/fix_for_1849

Reco fixes -- Minimal revert of the double delete introduced by 10a2578
ggovi · Dec 19, 2013 · 9a55682 · 9a55682
2 parents ce8a4ae + e7c8fe4
commit 9a55682
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/RecoPixelVertexing/PixelTrackFitting/src/PixelTrackReconstruction.cc b/RecoPixelVertexing/PixelTrackFitting/src/PixelTrackReconstruction.cc
@@ -66,6 +66,7 @@ PixelTrackReconstruction::PixelTrackReconstruction(const ParameterSet& cfg,
 
 PixelTrackReconstruction::~PixelTrackReconstruction() 
 {
+  delete theRegionProducer; theRegionProducer = nullptr;
   halt();
 }
 
@@ -74,7 +75,6 @@ void PixelTrackReconstruction::halt()
   delete theFitter; theFitter=0;
   delete theCleaner; theCleaner=0;
   delete theGenerator; theGenerator=0;
-  delete theRegionProducer; theRegionProducer=0;
   delete theMerger_; theMerger_=0;
 }
 

diff --git a/RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromRegionHitsEDProducer.cc b/RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromRegionHitsEDProducer.cc
@@ -52,10 +52,10 @@ SeedGeneratorFromRegionHitsEDProducer::SeedGeneratorFromRegionHitsEDProducer(
 
 SeedGeneratorFromRegionHitsEDProducer::~SeedGeneratorFromRegionHitsEDProducer()
 {
+  delete theRegionProducer; theRegionProducer = nullptr;
 }
 
 void SeedGeneratorFromRegionHitsEDProducer::endRun(edm::Run const&run, const edm::EventSetup& es) {
-  delete theRegionProducer;
   delete theGenerator;
 }