svn commit: r1845933 - /ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/GroovyUtil.java

Author: jleroux
Date: Tue Nov  6 16:33:11 2018
New Revision: 1845933

URL: http://svn.apache.org/viewvc?rev=1845933&view=rev
Log:
Fixed: Error in GetLocaleListTests.java
(OFBIZ-10641)

A test error related to GetLocaleListTests.java seems to happen only on a fresh
trunk install when running unit tests. It's no stopping tests.

I'm not sure yet if R17 is concerned. I did not try, but will 1st confirm with
this commit with trunk demo error.loç

Mathieu suggested to  replace the location
component://base/config/GroovyInit.groovy
with ofbizhome://framework/base/config/GroovyInit.groovy
because GroovyUtil [should not] depend on the component container in the
1st place, and it seems to work.

Thanks: Mathieu for the idea.

Modified:
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/GroovyUtil.java

Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/GroovyUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/GroovyUtil.java?rev=1845933&r1=1845932&r2=1845933&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/GroovyUtil.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/GroovyUtil.java Tue Nov  6 16:33:11 2018
@@ -63,7 +63,7 @@ public class GroovyUtil {
          *  the workaround is to execute at startup a script containing the @BaseScript annotation.
          */
         try {
-            GroovyUtil.runScriptAtLocation("component://base/config/GroovyInit.groovy", null, null);
+            GroovyUtil.runScriptAtLocation("ofbizhome://framework/base/config/GroovyInit.groovy", null, null);
         } catch (Exception e) {
             Debug.logWarning("The following error occurred during the initialization of Groovy: " + e.getMessage(), module);
         }