svn commit: r1868657 - /ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java

[mt...@apache.org]

Author: mthl
Date: Sun Oct 20 16:13:50 2019
New Revision: 1868657

URL: http://svn.apache.org/viewvc?rev=1868657&view=rev
Log:
Fixed: Fix regression introduced in revision 1867409
(OFBIZ-11192)

‘null’ was an unspecified valid value for the second argument of the
‘ComponentContainer#retrieveComponentConfig’ method.

Modified:
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java

Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java?rev=1868657&r1=1868656&r2=1868657&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java Sun Oct 20 16:13:50 2019
@@ -254,13 +254,13 @@ public class ComponentContainer implemen
      * Fetch the <code>ComponentConfig</code> for a certain component
      *
      * @param name component name
-     * @param location directory location of the component
+     * @param location directory location of the component which can be {@code null}
      * @return The component configuration
      */
     private static ComponentConfig retrieveComponentConfig(String name, Path location) {
         ComponentConfig config = null;
         try {
-            config = ComponentConfig.getComponentConfig(name, location.toString());
+            config = ComponentConfig.getComponentConfig(name, (location == null) ? null : location.toString());
         } catch (ComponentException e) {
             Debug.logError("Cannot load component : " + name + " @ " + location + " : " + e.getMessage(), module);
         }