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

[adrianc]

Author: adrianc
Date: Sun Feb  1 16:55:09 2009
New Revision: 739786

URL: http://svn.apache.org/viewvc?rev=739786&view=rev
Log:
Fixed a bug where the property name wasn't being returned when the property wasn't found - reported on dev mailing list.

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

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java?rev=739786&r1=739785&r2=739786&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java Sun Feb  1 16:55:09 2009
@@ -385,7 +385,7 @@
 
         ResourceBundle bundle = getResourceBundle(resource, locale);
 
-        if (bundle == null) return "";
+        if (bundle == null) return name;
 
         String value = null;
         try {
@@ -393,7 +393,7 @@
         } catch (Exception e) {
             //Debug.log(e.getMessage(), module);
         }
-        return value == null ? "" : value.trim();
+        return value == null ? name : value.trim();
     }
 
     /** Returns the value of the specified property name from the specified resource/properties file corresponding