From 7fc0f4cfddea52ebd841b148db53a4e6ddb45d11 Mon Sep 17 00:00:00 2001 From: Adam Heath Date: Wed, 3 Mar 2010 22:15:01 +0000 Subject: [PATCH] Remove a bunch of static variables, instead using an AtomicReference and an instance of EntityConfigUtil to manage everything. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918734 13f79535-47bb-0310-9956-ffa450edef68 --- .../ofbiz/entity/config/EntityConfigUtil.java | 74 ++++++++++--------- 1 file changed, 40 insertions(+), 34 deletions(-) diff --git a/framework/entity/src/org/ofbiz/entity/config/EntityConfigUtil.java b/framework/entity/src/org/ofbiz/entity/config/EntityConfigUtil.java index caf46208d4..a129e2dc2c 100644 --- a/framework/entity/src/org/ofbiz/entity/config/EntityConfigUtil.java +++ b/framework/entity/src/org/ofbiz/entity/config/EntityConfigUtil.java @@ -18,9 +18,9 @@ *******************************************************************************/ package org.ofbiz.entity.config; +import java.util.HashMap; import java.util.Map; - -import javolution.util.FastMap; +import java.util.concurrent.atomic.AtomicReference; import org.ofbiz.base.config.GenericConfigException; import org.ofbiz.base.config.ResourceLoader; @@ -40,24 +40,26 @@ public class EntityConfigUtil { public static final String module = EntityConfigUtil.class.getName(); public static final String ENTITY_ENGINE_XML_FILENAME = "entityengine.xml"; + private static volatile AtomicReference configRef = new AtomicReference(); + // ========== engine info fields ========== - protected static String txFactoryClass; - protected static String txFactoryUserTxJndiName; - protected static String txFactoryUserTxJndiServerName; - protected static String txFactoryTxMgrJndiName; - protected static String txFactoryTxMgrJndiServerName; - protected static String connFactoryClass; + private final String txFactoryClass; + private final String txFactoryUserTxJndiName; + private final String txFactoryUserTxJndiServerName; + private final String txFactoryTxMgrJndiName; + private final String txFactoryTxMgrJndiServerName; + private final String connFactoryClass; - protected static Map resourceLoaderInfos = FastMap.newInstance(); - protected static Map delegatorInfos = FastMap.newInstance(); - protected static Map entityModelReaderInfos = FastMap.newInstance(); - protected static Map entityGroupReaderInfos = FastMap.newInstance(); - protected static Map entityEcaReaderInfos = FastMap.newInstance(); - protected static Map entityDataReaderInfos = FastMap.newInstance(); - protected static Map fieldTypeInfos = FastMap.newInstance(); - protected static Map datasourceInfos = FastMap.newInstance(); + private final Map resourceLoaderInfos = new HashMap(); + private final Map delegatorInfos = new HashMap(); + private final Map entityModelReaderInfos = new HashMap(); + private final Map entityGroupReaderInfos = new HashMap(); + private final Map entityEcaReaderInfos = new HashMap(); + private final Map entityDataReaderInfos = new HashMap(); + private final Map fieldTypeInfos = new HashMap(); + private final Map datasourceInfos = new HashMap(); - protected static Element getXmlRootElement() throws GenericEntityConfException { + private static Element getXmlRootElement() throws GenericEntityConfException { try { return ResourceLoader.getXmlRootElement(ENTITY_ENGINE_XML_FILENAME); } catch (GenericConfigException e) { @@ -65,7 +67,7 @@ public class EntityConfigUtil { } } - protected static Document getXmlDocument() throws GenericEntityConfException { + private static Document getXmlDocument() throws GenericEntityConfException { try { return ResourceLoader.getXmlDocument(ENTITY_ENGINE_XML_FILENAME); } catch (GenericConfigException e) { @@ -81,7 +83,7 @@ public class EntityConfigUtil { } } - public static synchronized void reinitialize() throws GenericEntityException { + public static void reinitialize() throws GenericEntityException { try { ResourceLoader.invalidateDocument(ENTITY_ENGINE_XML_FILENAME); initialize(getXmlRootElement()); @@ -91,6 +93,10 @@ public class EntityConfigUtil { } public static void initialize(Element rootElement) throws GenericEntityException { + configRef.set(new EntityConfigUtil(rootElement)); + } + + private EntityConfigUtil(Element rootElement) throws GenericEntityException { // load the transaction factory Element transactionFactoryElement = UtilXml.firstChildElement(rootElement, "transaction-factory"); if (transactionFactoryElement == null) { @@ -177,62 +183,62 @@ public class EntityConfigUtil { } public static String getTxFactoryClass() { - return txFactoryClass; + return configRef.get().txFactoryClass; } public static String getTxFactoryUserTxJndiName() { - return txFactoryUserTxJndiName; + return configRef.get().txFactoryUserTxJndiName; } public static String getTxFactoryUserTxJndiServerName() { - return txFactoryUserTxJndiServerName; + return configRef.get().txFactoryUserTxJndiServerName; } public static String getTxFactoryTxMgrJndiName() { - return txFactoryTxMgrJndiName; + return configRef.get().txFactoryTxMgrJndiName; } public static String getTxFactoryTxMgrJndiServerName() { - return txFactoryTxMgrJndiServerName; + return configRef.get().txFactoryTxMgrJndiServerName; } public static String getConnectionFactoryClass() { - return connFactoryClass; + return configRef.get().connFactoryClass; } public static ResourceLoaderInfo getResourceLoaderInfo(String name) { - return resourceLoaderInfos.get(name); + return configRef.get().resourceLoaderInfos.get(name); } public static DelegatorInfo getDelegatorInfo(String name) { - return delegatorInfos.get(name); + return configRef.get().delegatorInfos.get(name); } public static EntityModelReaderInfo getEntityModelReaderInfo(String name) { - return entityModelReaderInfos.get(name); + return configRef.get().entityModelReaderInfos.get(name); } public static EntityGroupReaderInfo getEntityGroupReaderInfo(String name) { - return entityGroupReaderInfos.get(name); + return configRef.get().entityGroupReaderInfos.get(name); } public static EntityEcaReaderInfo getEntityEcaReaderInfo(String name) { - return entityEcaReaderInfos.get(name); + return configRef.get().entityEcaReaderInfos.get(name); } public static EntityDataReaderInfo getEntityDataReaderInfo(String name) { - return entityDataReaderInfos.get(name); + return configRef.get().entityDataReaderInfos.get(name); } public static FieldTypeInfo getFieldTypeInfo(String name) { - return fieldTypeInfos.get(name); + return configRef.get().fieldTypeInfos.get(name); } public static DatasourceInfo getDatasourceInfo(String name) { - return datasourceInfos.get(name); + return configRef.get().datasourceInfos.get(name); } public static Map getDatasourceInfos() { - return datasourceInfos; + return configRef.get().datasourceInfos; } }