Index: java/src/org/apache/xerces/impl/xs/identity/IdentityConstraint.java
===================================================================
RCS file: /home/cvspublic/xml-xerces/java/src/org/apache/xerces/impl/xs/identity/IdentityConstraint.java,v
retrieving revision 1.10
diff -u -r1.10 IdentityConstraint.java
--- java/src/org/apache/xerces/impl/xs/identity/IdentityConstraint.java	24 Feb 2004 22:59:14 -0000	1.10
+++ java/src/org/apache/xerces/impl/xs/identity/IdentityConstraint.java	8 Jul 2004 21:56:14 -0000
@@ -139,16 +139,20 @@
     // equals:  returns true if and only if the String
     // representations of all members of both objects (except for
     // the elenemtName field) are equal.
-    public boolean equals(IdentityConstraint id) {
-        boolean areEqual = fIdentityConstraintName.equals(id.fIdentityConstraintName);
-        if(!areEqual) return false;
-        areEqual = fSelector.toString().equals(id.fSelector.toString());
-        if(!areEqual) return false;
-        areEqual = (fFieldCount == id.fFieldCount);
-        if(!areEqual) return false;
-        for(int i=0; i<fFieldCount; i++)
-            if(!fFields[i].toString().equals(id.fFields[i].toString())) return false;
-        return true;
+    public boolean equals(Object o) {
+    	if (o instanceof IdentityConstraint) {
+    		IdentityConstraint id = (IdentityConstraint) o;
+            boolean areEqual = fIdentityConstraintName.equals(id.fIdentityConstraintName);
+            if(!areEqual) return false;
+            areEqual = fSelector.toString().equals(id.fSelector.toString());
+            if(!areEqual) return false;
+            areEqual = (fFieldCount == id.fFieldCount);
+            if(!areEqual) return false;
+            for(int i=0; i<fFieldCount; i++)
+                if(!fFields[i].toString().equals(id.fFields[i].toString())) return false;
+            return true;
+        }
+        return false;
     } // equals
 
     static final Field[] resize(Field[] oldArray, int newSize) {
Index: java/src/org/apache/xerces/impl/xs/util/XInt.java
===================================================================
RCS file: /home/cvspublic/xml-xerces/java/src/org/apache/xerces/impl/xs/util/XInt.java,v
retrieving revision 1.3
diff -u -r1.3 XInt.java
--- java/src/org/apache/xerces/impl/xs/util/XInt.java	24 Feb 2004 22:59:13 -0000	1.3
+++ java/src/org/apache/xerces/impl/xs/util/XInt.java	8 Jul 2004 21:56:34 -0000
@@ -37,8 +37,10 @@
         return (short)fValue;
     }
 
-    public final boolean equals(XInt compareVal) {
-        return (this.fValue == compareVal.fValue);
+    public final boolean equals(Object compareVal) {
+    	if (compareVal instanceof XInt)
+        	return (fValue == ((XInt)compareVal).fValue);
+        return false;
     }
 
     public String toString() {