summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/MetricsAdminI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/MetricsAdminI.cpp')
-rw-r--r--cpp/src/Ice/MetricsAdminI.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp
index dfb6b513858..8c67035a42d 100644
--- a/cpp/src/Ice/MetricsAdminI.cpp
+++ b/cpp/src/Ice/MetricsAdminI.cpp
@@ -84,7 +84,7 @@ parseRule(const PropertiesPtr& properties, const string& name)
}
catch(const std::exception&)
{
- throw "invalid regular expression `" + p->second + "' for `" + p->first + "'";
+ throw invalid_argument("invalid regular expression `" + p->second + "' for `" + p->first + "'");
}
}
return regexps;
@@ -315,11 +315,6 @@ MetricsViewI::addOrUpdateMap(const PropertiesPtr& properties, const string& mapN
::Ice::Warning warn(logger);
warn << "unexpected exception while creating metrics map:\n" << ex;
}
- catch(const string& msg)
- {
- ::Ice::Warning warn(logger);
- warn << msg;
- }
return true;
}