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: Small changes forward ported from 2.3-gae.
Date Wed, 15 Mar 2017 13:57:40 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/3 755b25a3e -> a10c1a92e


Small changes forward ported from 2.3-gae.


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

Branch: refs/heads/3
Commit: a10c1a92ea4d2a199a2f23755829e097dd4a932a
Parents: 755b25a
Author: ddekany <ddekany@apache.org>
Authored: Wed Mar 15 14:57:34 2017 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Wed Mar 15 14:57:34 2017 +0100

----------------------------------------------------------------------
 build.xml                                                          | 2 +-
 src/main/java/org/apache/freemarker/core/BuiltInsForSequences.java | 2 +-
 .../core/model/impl/DefaultObjectWrapperConfiguration.java         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a10c1a92/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 7f5509c..18c51ca 100644
--- a/build.xml
+++ b/build.xml
@@ -542,7 +542,7 @@
   </target>
   
   <target name="_dist"
-    depends="jar, javadoc, manualOffline"
+    depends="jar, test, javadoc, manualOffline"
   >
     <delete dir="${dist.dir}" />
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a10c1a92/src/main/java/org/apache/freemarker/core/BuiltInsForSequences.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/BuiltInsForSequences.java b/src/main/java/org/apache/freemarker/core/BuiltInsForSequences.java
index 855a5d4..814b362 100644
--- a/src/main/java/org/apache/freemarker/core/BuiltInsForSequences.java
+++ b/src/main/java/org/apache/freemarker/core/BuiltInsForSequences.java
@@ -715,7 +715,7 @@ class BuiltInsForSequences {
                     if (key == null) {
                         throw new _TemplateModelException(
                                 startErrorMessage(keyNamesLn, i),
-                                "The " + _StringUtil.jQuote(keyNames[keyNameI]), " subvariable
was not found.");
+                                "The " + _StringUtil.jQuote(keyNames[keyNameI]), " subvariable
was null or missing.");
                     }
                 } // for each key
                 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a10c1a92/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperConfiguration.java
b/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperConfiguration.java
index 8ca16de..28111d4 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperConfiguration.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperConfiguration.java
@@ -35,7 +35,7 @@ public abstract class DefaultObjectWrapperConfiguration implements Cloneable
{
 
     private final Version incompatibleImprovements;
 
-    protected ClassIntrospectorBuilder classIntrospectorBuilder;
+    ClassIntrospectorBuilder classIntrospectorBuilder;
 
     // Properties and their *defaults*:
     private boolean simpleMapWrapper = false;


Mime
View raw message