Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3-gae f1f8080b4 -> 056bf1cd7


Minor error message generation fix.


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

Branch: refs/heads/2.3-gae
Commit: cdd12d8be3a4b016d8564f7d7feadbb28c3cfa23
Parents: f1f8080
Author: ddekany <ddek...@apache.org>
Authored: Fri Aug 11 23:46:03 2017 +0200
Committer: ddekany <ddek...@apache.org>
Committed: Fri Aug 11 23:46:03 2017 +0200

----------------------------------------------------------------------
 src/main/java/freemarker/core/UnexpectedTypeException.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cdd12d8b/src/main/java/freemarker/core/UnexpectedTypeException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/UnexpectedTypeException.java 
b/src/main/java/freemarker/core/UnexpectedTypeException.java
index 73420e3..0878f81 100644
--- a/src/main/java/freemarker/core/UnexpectedTypeException.java
+++ b/src/main/java/freemarker/core/UnexpectedTypeException.java
@@ -104,7 +104,7 @@ public class UnexpectedTypeException extends 
TemplateException {
                                 new 
_DelayedJQuote(blamedAssignmentTargetVarName) }), 
                 " has evaluated to ",
                 new _DelayedAOrAn(new _DelayedFTLTypeDescription(model)),
-                (blamedAssignmentTargetVarName == null ? ":" : ".")};
+                (blamed != null ? ":" : ".")};
     }
     
 }

Reply via email to