From: Gunnar Beutner <gunnar@beutner.name>
Date: Fri, 21 Nov 2014 17:35:59 +0000 (+0100)
Subject: Make sure source information is always available for error messages
X-Git-Tag: v2.3.0~648
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ab61291c6990594d767d87a0c04963cc59e79e8;p=icinga2

Make sure source information is always available for error messages

refs #7699
---

diff --git a/lib/config/expression.cpp b/lib/config/expression.cpp
index 7bcb627b4..e3cbc3db3 100644
--- a/lib/config/expression.cpp
+++ b/lib/config/expression.cpp
@@ -46,7 +46,7 @@ Value Expression::Evaluate(const Object::Ptr& context, DebugHint *dhint) const
 
 		return DoEvaluate(context, dhint);
 	} catch (const std::exception& ex) {
-		if (dynamic_cast<const ConfigError *>(&ex) || boost::get_error_info<boost::errinfo_nested_exception>(ex))
+		if (boost::get_error_info<boost::errinfo_nested_exception>(ex))
 			throw;
 		else
 			BOOST_THROW_EXCEPTION(ConfigError("Error while evaluating expression: " + String(ex.what()))