svn commit: r1818539 - in /ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config: JNDIConfigUtil.java MainResourceHandler.java

[mbrohl]

Author: mbrohl
Date: Mon Dec 18 09:23:30 2017
New Revision: 1818539

URL: http://svn.apache.org/viewvc?rev=1818539&view=rev
Log:
Improved: General refactoring and code improvements, package 
org.apache.ofbiz.base.config.
(OFBIZ-9935)

Thanks Dennis Balkir for reporting and providing the patch.

Modified:
    
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java
    
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java

Modified: 
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java?rev=1818539&r1=1818538&r2=1818539&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java
 Mon Dec 18 09:23:30 2017
@@ -32,7 +32,7 @@ public final class JNDIConfigUtil {
 
     public static final String module = JNDIConfigUtil.class.getName();
     private static final String JNDI_CONFIG_XML_FILENAME = "jndiservers.xml";
-    private static final ConcurrentHashMap<String, JndiServerInfo> 
jndiServerInfos = new ConcurrentHashMap<String, JndiServerInfo>();
+    private static final ConcurrentHashMap<String, JndiServerInfo> 
jndiServerInfos = new ConcurrentHashMap<>();
     private JNDIConfigUtil() {};
 
     private static Element getXmlRootElement() throws GenericConfigException {
@@ -50,7 +50,7 @@ public final class JNDIConfigUtil {
             Debug.logError(e, "Error loading JNDI config XML file " + 
JNDI_CONFIG_XML_FILENAME, module);
         }
     }
-    public static void initialize(Element rootElement) throws 
GenericConfigException {
+    public static void initialize(Element rootElement) {
         // jndi-server - jndiServerInfos
         for (Element curElement: UtilXml.childElementList(rootElement, 
"jndi-server")) {
             JndiServerInfo jndiServerInfo = new JndiServerInfo(curElement);

Modified: 
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java?rev=1818539&r1=1818538&r2=1818539&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java
 Mon Dec 18 09:23:30 2017
@@ -42,7 +42,9 @@ public final class MainResourceHandler i
         this.xmlFilename = xmlFilename;
         this.loaderName = element.getAttribute("loader");
         this.location = element.getAttribute("location");
-        if (Debug.verboseOn()) Debug.logVerbose("Created " + this.toString(), 
module);
+        if (Debug.verboseOn()) {
+            Debug.logVerbose("Created " + this.toString(), module);
+        }
     }
 
     public MainResourceHandler(String xmlFilename, String loaderName, String 
location) {