Changeset 5714

Timestamp:

2003-10-23T10:53:39+13:00 (21 years ago)

Author:

jmt12

Message:

The equals method occasionally bombed - which may have caused a problem when occasionally importing

File:

• trunk/gli/src/org/greenstone/gatherer/msm/ElementWrapper.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/msm/ElementWrapper.java

@@ -103 +103 @@
      * @param object The <strong>Object</strong> to test against.
      */
-    public boolean equals(Object object) {
-    if(object instanceof ElementWrapper) {
-        String our_full_name = MSMUtils.getFullName(element, namespace);
-        String their_full_name = MSMUtils.getFullName(((ElementWrapper)object).getElement());
-        return our_full_name.equals(their_full_name);
-    }
-    return toString().equals(object.toString());
+   public boolean equals(Object object) {
+      if(object == null) {
+     return false;
+      }
+      if(object instanceof ElementWrapper) {
+     String our_full_name = MSMUtils.getFullName(element, namespace);
+     String their_full_name = MSMUtils.getFullName(((ElementWrapper)object).getElement());
+     return our_full_name.equals(their_full_name);
+      }
+      return toString().equals(object.toString());
     }
     /** Retrieve the attributes associated with the element this element wrapper is built around.