[Mulgara-svn] r811 - branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query

[pag at mulgara.org]

Author: pag
Date: 2008-04-22 10:27:18 -0700 (Tue, 22 Apr 2008)
New Revision: 811

Modified:
   branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/ConstraintFilter.java
Log:
Adjusted the equality comparison

Modified: branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/ConstraintFilter.java
===================================================================
--- branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/ConstraintFilter.java	2008-04-22 17:26:28 UTC (rev 810)
+++ branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/ConstraintFilter.java	2008-04-22 17:27:18 UTC (rev 811)
@@ -123,8 +123,11 @@
     if (object == null) return false;
     if (object == this) return true;
 
-    // Check that the given object is the correct class if so check each element.
-    return ConstraintFilter.class.equals(object.getClass()) &&
-           constraint.equals(((ConstraintFilter)object).constraint);
+    // Check that the given object is the correct class.
+    if (!ConstraintFilter.class.equals(object.getClass())) return false;
+    // check each element.
+    ConstraintFilter other = (ConstraintFilter)object;
+    // can't do an equals() on filter, as this evaluates the filter in context
+    return constraint.equals(other.constraint) && filter == other.filter;
   }
 }