You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2018/02/04 01:41:33 UTC
[1/2] incubator-freemarker git commit: (Added one more FM3 TODO
comment)
Repository: incubator-freemarker
Updated Branches:
refs/heads/3 e623d9b60 -> be2d4fcc4
(Added one more FM3 TODO comment)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a937af08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a937af08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a937af08
Branch: refs/heads/3
Commit: a937af08fd94019a809506b1be8b581ff8dea3a5
Parents: e623d9b
Author: ddekany <dd...@apache.org>
Authored: Sun Feb 4 02:39:43 2018 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Feb 4 02:41:25 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/freemarker/core/BuiltInsForSequences.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a937af08/freemarker-core/src/main/java/org/apache/freemarker/core/BuiltInsForSequences.java
----------------------------------------------------------------------
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/BuiltInsForSequences.java b/freemarker-core/src/main/java/org/apache/freemarker/core/BuiltInsForSequences.java
index 0052a81..ad50975 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/BuiltInsForSequences.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/BuiltInsForSequences.java
@@ -242,7 +242,7 @@ class BuiltInsForSequences {
throw new TemplateException(
"The sequence to join was right-unbounded numerical range, thus it's infinitely long.");
}
- return new BIMethodForIterable((TemplateIterableModel) model);
+ return new BIMethodForIterable(model);
}
}
@@ -330,7 +330,7 @@ class BuiltInsForSequences {
@Override
TemplateModel calculateResult(TemplateIterableModel model) throws TemplateException {
- return new BIMethod((TemplateIterableModel) model);
+ return new BIMethod(model);
}
}
@@ -807,7 +807,7 @@ class BuiltInsForSequences {
_EvalUtils.CMP_OP_EQUALS, null,
searchedItem, null,
null, false,
- true, true, true, // The last one is true to emulate an old bug for BC
+ true, true, true, // TODO [FM3] The last one is true to emulate an old bug for BC
env);
} catch (TemplateException ex) {
throw new TemplateException(ex,
[2/2] incubator-freemarker git commit: Forward ported FREEMARKER-88
(code clarity only; it doesn't cause problem in FM3)
Posted by dd...@apache.org.
Forward ported FREEMARKER-88 (code clarity only; it doesn't cause problem in FM3)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/be2d4fcc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/be2d4fcc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/be2d4fcc
Branch: refs/heads/3
Commit: be2d4fcc48361fdb677c0765ad8eee90ba952e3a
Parents: a937af0
Author: ddekany <dd...@apache.org>
Authored: Sun Feb 4 02:40:47 2018 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Feb 4 02:41:26 2018 +0100
----------------------------------------------------------------------
.../org/apache/freemarker/servlet/jsp/JspTagModelBase.java | 2 +-
.../freemarker/servlet/jsp/SimpleTagDirectiveModel.java | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/be2d4fcc/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java
----------------------------------------------------------------------
diff --git a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java
index 3e01c54..7205702 100644
--- a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java
+++ b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java
@@ -138,7 +138,7 @@ abstract class JspTagModelBase implements TemplateModelWithOriginName {
throw (TemplateException) e;
}
if (e instanceof TemplateExceptionWrapperJspException) {
- return (TemplateException) e.getCause();
+ return ((TemplateExceptionWrapperJspException) e).getCause();
}
return new TemplateException(e,
"Error while invoking the ", new _DelayedJQuote(tagName), " JSP custom tag; see cause exception");
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/be2d4fcc/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java
----------------------------------------------------------------------
diff --git a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java
index 28155d7..619b8c6 100644
--- a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java
+++ b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java
@@ -118,10 +118,15 @@ class SimpleTagDirectiveModel extends JspTagModelBase implements TemplateDirecti
static final class TemplateExceptionWrapperJspException extends JspException {
- public TemplateExceptionWrapperJspException(Throwable cause) {
+ public TemplateExceptionWrapperJspException(TemplateException cause) {
super("Nested content has thrown template exception", cause);
}
+ @Override
+ public TemplateException getCause() {
+ return (TemplateException) super.getCause();
+ }
+
}
}