svn commit: r990347 - /ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java

[lektran]

Author: lektran
Date: Sat Aug 28 11:35:24 2010
New Revision: 990347

URL: http://svn.apache.org/viewvc?rev=990347&view=rev
Log:
Completed the fix reported in r989475 (and subsequently reverted in r989722) by Erwan.
The condition-object element used to have an attribute named "field-name" which was later replaced with "field" but the code was instead checking for "field-name" and then "name".
Fixed so that the code checks for "field" and then "field-name".

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java?rev=990347&r1=990346&r2=990347&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java Sat Aug 28 11:35:24 2010
@@ -312,10 +312,10 @@ public class EntityFinderUtil {
         protected FlexibleMapAccessor<Object> fieldNameAcsr;
 
         public ConditionObject(Element conditionExprElement) {
-            this.fieldNameAcsr = FlexibleMapAccessor.getInstance(conditionExprElement.getAttribute("field-name"));
+            this.fieldNameAcsr = FlexibleMapAccessor.getInstance(conditionExprElement.getAttribute("field"));
             if (this.fieldNameAcsr.isEmpty()) {
-                // no "field-name"? try "name"
-                this.fieldNameAcsr = FlexibleMapAccessor.getInstance(conditionExprElement.getAttribute("name"));
+                // no "field"? try "field-name"
+                this.fieldNameAcsr = FlexibleMapAccessor.getInstance(conditionExprElement.getAttribute("field-name"));
             }
         }