ERXKeyValueQualifier should try valueForKeyPath if valueForKey doesn'…

…t return a value
wocommunity · Apr 30, 2012 · c6faf31 · c6faf31
1 parent f167473
commit c6faf31
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/qualifiers/ERXToManyQualifier.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/qualifiers/ERXToManyQualifier.java
@@ -278,16 +278,18 @@ public void addQualifierKeysToSet(NSMutableSet arg0) {
     @SuppressWarnings("unchecked")
     public boolean evaluateWithObject(Object object) {
     	boolean result = false;
-    	if ( ( object != null ) && ( ( object instanceof NSKeyValueCoding ) == true ) ) {
-            Object obj = ((NSKeyValueCoding)object).valueForKey(this.key());
+    	if (object != null && object instanceof NSKeyValueCoding) {
+            Object obj = ((NSKeyValueCoding)object).valueForKey(key());
+            if (obj == null && object instanceof NSKeyValueCodingAdditions) {
+            	obj = ((NSKeyValueCodingAdditions)object).valueForKeyPath(key());
+            }
             if (obj instanceof NSArray) {
             	NSArray objArray = (NSArray)obj;
-            	int objArrayCount = objArray.count();
-            	if (objArrayCount > 0) {
+            	if (!objArray.isEmpty()) {
             		if(_minCount == 0) {
             			result = ERXArrayUtilities.arrayContainsArray(objArray, elements());
             		} else {
-            			return ERXArrayUtilities.intersectingElements(objArray, elements()).count() >= _minCount;
+            			result = ERXArrayUtilities.intersectingElements(objArray, elements()).count() >= _minCount;
             		}
             	}
             }