freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [2/3] incubator-freemarker git commit: (Minor code cleanup)
Date Fri, 11 Aug 2017 22:20:54 GMT
(Minor code cleanup)


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

Branch: refs/heads/2.3-gae
Commit: 924a420119b72f663769d7f3e9422ba22637478f
Parents: cdd12d8
Author: ddekany <ddekany@apache.org>
Authored: Fri Aug 11 23:46:17 2017 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Fri Aug 11 23:46:17 2017 +0200

----------------------------------------------------------------------
 src/main/java/freemarker/template/utility/Constants.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/924a4201/src/main/java/freemarker/template/utility/Constants.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/Constants.java b/src/main/java/freemarker/template/utility/Constants.java
index fd48e70..ef8333d 100644
--- a/src/main/java/freemarker/template/utility/Constants.java
+++ b/src/main/java/freemarker/template/utility/Constants.java
@@ -96,7 +96,7 @@ public class Constants {
         
     }
     
-    public static final TemplateHashModelEx EMPTY_HASH = new EmptyHashModel();
+    public static final TemplateHashModelEx2 EMPTY_HASH = new EmptyHashModel();
     
     /**
      * An empty hash. Since 2.3.27, it implements {@link TemplateHashModelEx2}, before that
it was only
@@ -133,12 +133,9 @@ public class Constants {
     /**
      * @since 2.3.27
      */
-    public static final KeyValuePairIterator EMPTY_KEY_VALUE_PAIR_ITERATOR = EmptyKeyValuePairIterator.INSTANCE;
+    public static final KeyValuePairIterator EMPTY_KEY_VALUE_PAIR_ITERATOR = new EmptyKeyValuePairIterator();
     
     private static class EmptyKeyValuePairIterator implements TemplateHashModelEx2.KeyValuePairIterator
{
-
-        static final EmptyKeyValuePairIterator INSTANCE = new EmptyKeyValuePairIterator();
-
         private EmptyKeyValuePairIterator() {
             //
         }


Mime
View raw message