svn commit: r607823 - /ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/UtilProperties.java

[lektran]

Author: lektran
Date: Tue Jan  1 02:50:01 2008
New Revision: 607823

URL: http://svn.apache.org/viewvc?rev=607823&view=rev
Log:
Fixed a small problem with the new xml uiLabels, fail-property in minilang wasn't able to retrieve any xml properties.

Modified:
    ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/UtilProperties.java

Modified: ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/UtilProperties.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/UtilProperties.java?rev=607823&r1=607822&r2=607823&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/UtilProperties.java (original)
+++ ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/UtilProperties.java Tue Jan  1 02:50:01 2008
@@ -665,6 +665,7 @@
         if (UtilValidate.isEmpty(resource)) {
             throw new IllegalArgumentException("resource cannot be null or empty");
         }
+        // This is for *.properties files only (not *.xml files)
         String resourceName = createResourceName(resource, locale);
         if (propertiesNotFound.contains(resourceName)) {
             return null;
@@ -679,7 +680,7 @@
                 }
             }
             // Check for XML properties file next
-            url = FlexibleLocation.resolveLocation(resourceName + ".xml");
+            url = FlexibleLocation.resolveLocation(resource + ".xml");
             if (url != null) {
                 return url;
             }