freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject incubator-freemarker git commit: FREEMARKER-71: When using exp?eval, if the expression inside evaluated string throws an exception, the cause exception of that exception was lost.
Date Sat, 16 Sep 2017 13:28:28 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/3 f9b60a74e -> eceaac29c


FREEMARKER-71: When using exp?eval, if the expression inside evaluated string throws an exception,
the cause exception of that exception was lost.


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/eceaac29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/eceaac29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/eceaac29

Branch: refs/heads/3
Commit: eceaac29c5a93c95aeb911bbe5e08a6828c163b2
Parents: f9b60a7
Author: ddekany <ddekany@apache.org>
Authored: Sat Sep 16 15:28:13 2017 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Sat Sep 16 15:28:13 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/freemarker/core/BuiltInsForStringsMisc.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/eceaac29/freemarker-core/src/main/java/org/apache/freemarker/core/BuiltInsForStringsMisc.java
----------------------------------------------------------------------
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/BuiltInsForStringsMisc.java
b/freemarker-core/src/main/java/org/apache/freemarker/core/BuiltInsForStringsMisc.java
index 26821a3..be95c94 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/BuiltInsForStringsMisc.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/BuiltInsForStringsMisc.java
@@ -29,8 +29,8 @@ import org.apache.freemarker.core.model.TemplateBooleanModel;
 import org.apache.freemarker.core.model.TemplateDirectiveModel;
 import org.apache.freemarker.core.model.TemplateFunctionModel;
 import org.apache.freemarker.core.model.TemplateModel;
-import org.apache.freemarker.core.model.TemplateStringModel;
 import org.apache.freemarker.core.model.TemplateSequenceModel;
+import org.apache.freemarker.core.model.TemplateStringModel;
 import org.apache.freemarker.core.model.impl.BeanModel;
 import org.apache.freemarker.core.model.impl.DefaultObjectWrapper;
 import org.apache.freemarker.core.model.impl.SimpleNumber;
@@ -105,7 +105,7 @@ class BuiltInsForStringsMisc {
             try {
                 return exp.eval(env);
             } catch (TemplateException e) {
-                throw new TemplateException(this, env,
+                throw new TemplateException(e, this, env,
                         "Failed to \"?", key, "\" string with this error:\n\n",
                         MessageUtils.EMBEDDED_MESSAGE_BEGIN,
                         new _DelayedGetMessageWithoutStackTop(e),


Mime
View raw message