Re: svn commit: r1169701 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java

[Adrian Crum-3]

One of several examples of why project-wide regexp search-and-replace is
not a good approach to application development.

-Adrian

On 9/12/2011 12:47 PM, [hidden email] wrote:

> Author: jleroux
> Date: Mon Sep 12 11:47:15 2011
> New Revision: 1169701
>
> URL: http://svn.apache.org/viewvc?rev=1169701&view=rev
> Log:
> Fix a bug introduced in r1169478
> Thanks to Hans for reporting on dev ML
>
> Modified:
>      ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java?rev=1169701&r1=1169700&r2=1169701&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java Mon Sep 12 11:47:15 2011
> @@ -121,7 +121,7 @@ public class FlexibleMapAccessor<T>  impl
>        * @return the found value
>        */
>       public T get(Map<String, ? extends Object>  base, Locale locale) {
> -        if (UtilValidate.isEmpty(base)) {
> +        if (base == null || this.isEmpty()) {
>               return null;
>           }
>           if (!base.containsKey(UelUtil.localizedMapLocaleKey)&&  locale != null) {
>
>