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: Missing part from: Bug #439: FileTemplateLoader with emulateCaseSensitiveFileSystem set to true (used for development) wasn't properly synchronized, leading to random NullPointerException-s or other misbehavior.
Date Sat, 26 Sep 2015 06:29:21 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3-gae dfd07ec50 -> e90143c89


Missing part from: Bug #439: FileTemplateLoader with emulateCaseSensitiveFileSystem set to
true (used for development) wasn't properly synchronized, leading to random NullPointerException-s
or other misbehavior.


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

Branch: refs/heads/2.3-gae
Commit: e90143c8975bc53afcec85f2d80e704831f4e5a3
Parents: dfd07ec
Author: ddekany <ddekany@apache.org>
Authored: Sat Sep 26 08:26:38 2015 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Sat Sep 26 08:26:38 2015 +0200

----------------------------------------------------------------------
 src/main/java/freemarker/cache/FileTemplateLoader.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e90143c8/src/main/java/freemarker/cache/FileTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/FileTemplateLoader.java b/src/main/java/freemarker/cache/FileTemplateLoader.java
index 50108ff..d14368f 100644
--- a/src/main/java/freemarker/cache/FileTemplateLoader.java
+++ b/src/main/java/freemarker/cache/FileTemplateLoader.java
@@ -263,8 +263,10 @@ public class FileTemplateLoader implements TemplateLoader {
                 }
             }
         }
-    
-        correctCasePaths.put(sourcePath, Boolean.TRUE);        
+
+        synchronized (correctCasePaths) {
+            correctCasePaths.put(sourcePath, Boolean.TRUE);        
+        }
         return true;
     }
 


Mime
View raw message