Author: nbubna
Date: Sat May 23 22:51:51 2009
New Revision: 778056
URL: http://svn.apache.org/viewvc?rev=778056&view=rev
Log:
MapFactory no longer needed, just use ConcurrentHashMap
Removed:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/MapFactory.java
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/VelocimacroManager.java
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/VelocimacroManager.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/VelocimacroManager.java?rev=778056&r1=778055&r2=778056&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/VelocimacroManager.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/VelocimacroManager.java
Sat May 23 22:51:51 2009
@@ -31,7 +31,7 @@
import org.apache.velocity.runtime.directive.VelocimacroProxy;
import org.apache.velocity.runtime.parser.node.Node;
import org.apache.velocity.runtime.parser.node.SimpleNode;
-import org.apache.velocity.util.MapFactory;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Manages VMs in namespaces. Currently, two namespace modes are
@@ -56,7 +56,7 @@
private boolean registerFromLib = false;
/** Hash of namespace hashes. */
- private final Map namespaceHash = MapFactory.create(17, 0.5f, 20, false);
+ private final Map namespaceHash = new ConcurrentHashMap(17, 0.5f, 20);
/** reference to global namespace hash */
private final Map globalNamespace;
@@ -362,7 +362,7 @@
*/
private Map addNamespace(final String namespace)
{
- Map h = MapFactory.create(17, 0.5f, 20, false);
+ Map h = new ConcurrentHashMap(17, 0.5f, 20);
Object oh;
if ((oh = namespaceHash.put(namespace, h)) != null)
