You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2015/06/24 21:18:16 UTC
svn commit: r1687348 -
/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/TreeFactory.java
Author: adrianc
Date: Wed Jun 24 19:18:16 2015
New Revision: 1687348
URL: http://svn.apache.org/r1687348
Log:
Removed DCL code from TreeFactory.java, small code cleanup.
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/TreeFactory.java
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/TreeFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/TreeFactory.java?rev=1687348&r1=1687347&r2=1687348&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/TreeFactory.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/TreeFactory.java Wed Jun 24 19:18:16 2015
@@ -48,26 +48,15 @@ public class TreeFactory {
throws IOException, SAXException, ParserConfigurationException {
Map<String, ModelTree> modelTreeMap = treeLocationCache.get(resourceName);
if (modelTreeMap == null) {
- synchronized (TreeFactory.class) {
- modelTreeMap = treeLocationCache.get(resourceName);
- if (modelTreeMap == null) {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- if (loader == null) {
- loader = TreeFactory.class.getClassLoader();
- }
-
- URL treeFileUrl = null;
- treeFileUrl = FlexibleLocation.resolveLocation(resourceName); //, loader);
- Document treeFileDoc = UtilXml.readXmlDocument(treeFileUrl, true, true);
- modelTreeMap = readTreeDocument(treeFileDoc, delegator, dispatcher, resourceName);
- treeLocationCache.put(resourceName, modelTreeMap);
- }
- }
+ URL treeFileUrl = FlexibleLocation.resolveLocation(resourceName);
+ Document treeFileDoc = UtilXml.readXmlDocument(treeFileUrl, true, true);
+ modelTreeMap = readTreeDocument(treeFileDoc, delegator, dispatcher, resourceName);
+ modelTreeMap = treeLocationCache.putIfAbsentAndGet(resourceName, modelTreeMap);
}
-
ModelTree modelTree = modelTreeMap.get(treeName);
if (modelTree == null) {
- throw new IllegalArgumentException("Could not find tree with name [" + treeName + "] in class resource [" + resourceName + "]");
+ throw new IllegalArgumentException("Could not find tree with name [" + treeName + "] in class resource ["
+ + resourceName + "]");
}
return modelTree;
}