Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove redundant addition of exception context #18054

Merged
merged 1 commit into from
Mar 24, 2017
Merged

Remove redundant addition of exception context #18054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions FWCore/Framework/src/GlobalSchedule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,11 @@ namespace edm {
worker->doWork<T>(p, es,StreamID::invalidStreamID(), parentContext, context);
}
catch (cms::Exception & ex) {
std::ostringstream ost;
ost << "Processing " <<T::transitionName()<<" "<< p.id();
ex.addContext(ost.str());
if(ex.context().empty()) {
std::ostringstream ost;
ost << "Processing " <<T::transitionName()<<" "<< p.id();
ex.addContext(ost.str());
}
throw;
}
}
Expand Down
8 changes: 5 additions & 3 deletions FWCore/Framework/src/StreamSchedule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,9 +616,11 @@ namespace edm {
results_inserter_->doWork<Traits>(ep, es, streamID_, parentContext, &streamContext_);
}
catch (cms::Exception & ex) {
std::ostringstream ost;
ost << "Processing Event " << ep.id();
ex.addContext(ost.str());
if(ex.context().empty()) {
std::ostringstream ost;
ost << "Processing Event " << ep.id();
ex.addContext(ost.str());
}
iExcept = std::current_exception();
}
catch(...) {
Expand Down