svn commit: r1839853 - /tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/factory/BasicPreparerFactory.java

[nlebas]

Author: nlebas
Date: Sat Sep  1 21:20:02 2018
New Revision: 1839853

URL: http://svn.apache.org/viewvc?rev=1839853&view=rev
Log:
Fix the build

Modified:
    
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/factory/BasicPreparerFactory.java

Modified: 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/factory/BasicPreparerFactory.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/factory/BasicPreparerFactory.java?rev=1839853&r1=1839852&r2=1839853&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/factory/BasicPreparerFactory.java
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/factory/BasicPreparerFactory.java
 Sat Sep  1 21:20:02 2018
@@ -20,7 +20,9 @@
  */
 package org.apache.tiles.preparer.factory;
 
+import java.util.Collections;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.tiles.preparer.ViewPreparer;
@@ -49,12 +51,14 @@ public class BasicPreparerFactory implem
      * Maps a preparer name to the instantiated preparer.
      */
     protected Map<String, ViewPreparer> preparers;
+    protected Set<String> knownPreparers;
 
     /**
      * Constructor.
      */
     public BasicPreparerFactory() {
-        this.preparers = new ConcurrentHashMap<String, ViewPreparer>;
+        this.preparers = new ConcurrentHashMap<String, ViewPreparer>();
+        this.knownPreparers = Collections.newSetFromMap(new 
ConcurrentHashMap<String, Boolean>());
     }
 
 
@@ -68,8 +72,12 @@ public class BasicPreparerFactory implem
      */
     public ViewPreparer getPreparer(String name, Request context) {
 
-        if (!preparers.containsKey(name)) {
-            preparers.put(name, createPreparer(name));
+        if (!knownPreparers.contains(name)) {
+            knownPreparers.add(name);
+            ViewPreparer preparer = createPreparer(name);
+            if (preparer != null) {
+               preparers.put(name, preparer);
+            }
         }
 
         return preparers.get(name);