Author: jonesde
Date: Tue May 20 13:43:01 2008
New Revision: 658420
URL: http://svn.apache.org/viewvc?rev=658420&view=rev
Log:
Fixed NPE introduced in a recent commit, reported by BJ Freeman
Modified:
ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/string/FlexibleStringExpander.java
Modified:
ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/string/FlexibleStringExpander.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/string/FlexibleStringExpander.java?rev=658420&r1=658419&r2=658420&view=diff
==============================================================================
---
ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/string/FlexibleStringExpander.java
(original)
+++
ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/string/FlexibleStringExpander.java
Tue May 20 13:43:01 2008
@@ -84,7 +84,7 @@
* @return The original String expanded by replacing varaible place
holders.
*/
public String expandString(Map<String, ? extends Object> context) {
- return this.expandString(context, (Locale) context.get("locale"));
+ return this.expandString(context, context != null ? (Locale)
context.get("locale") : null);
}
/**
