From aa420fc94dc6f15ff6e086a7498b371bfdf93ea3 Mon Sep 17 00:00:00 2001 From: Automatic source maintenance Date: Wed, 30 Mar 2011 18:22:13 -0600 Subject: [PATCH] SourceFormat Enforcement --- src/adaptation/ecap/ServiceRep.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/adaptation/ecap/ServiceRep.cc b/src/adaptation/ecap/ServiceRep.cc index b30e37f06a..2a8fa88bde 100644 --- a/src/adaptation/ecap/ServiceRep.cc +++ b/src/adaptation/ecap/ServiceRep.cc @@ -102,12 +102,10 @@ Adaptation::Ecap::ServiceRep::finalize() try { tryConfigureAndStart(); Must(up()); - } - catch (const std::exception &e) { // standardized exceptions + } catch (const std::exception &e) { // standardized exceptions if (!handleFinalizeFailure(e.what())) throw; // rethrow for upper layers to handle - } - catch (...) { // all other exceptions + } catch (...) { // all other exceptions if (!handleFinalizeFailure("unrecognized exception")) throw; // rethrow for upper layers to handle } @@ -135,7 +133,7 @@ bool Adaptation::Ecap::ServiceRep::handleFinalizeFailure(const char *error) { const bool salvage = cfg().bypass; - const int level = salvage ? DBG_IMPORTANT : DBG_CRITICAL; + const int level = salvage ? DBG_IMPORTANT :DBG_CRITICAL; const char *kind = salvage ? "optional" : "essential"; debugs(93, level, "ERROR: failed to start " << kind << " eCAP service: " << cfg().uri << ":\n" << error); @@ -148,7 +146,7 @@ Adaptation::Ecap::ServiceRep::handleFinalizeFailure(const char *error) debugs(93, level, "WARNING: " << kind << " eCAP service is " << "down after initialization failure: " << cfg().uri); - return true; // tell the caller to ignore the problem because we handled it + return true; // tell the caller to ignore the problem because we handled it } bool Adaptation::Ecap::ServiceRep::probed() const -- 2.47.3