Changeset 5085

Timestamp:

2003-08-04T11:40:52+12:00 (21 years ago)

Author:

jmt12

Message:

Changed the metadata element comparator so failing to find a set doesn't NPE, but fails gracefully.

File:

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

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

@@ -911 +911 @@
             MetadataSet set = Gatherer.c_man.getCollection().msm.getSet(e1.getNamespace());
             ///ystem.err.print("MetadataSet.compare(" + e1 + ", " + e2 + ") = ");
-            result = set.compare(e1.getElement(), e2.getElement());
-            ///ystem.err.println(result);
-            if(result == 0 && v1 != null && v2 != null) {
-            // Finally we compare the values alphabetically.
-            result = v1.compareTo(v2);
+            if(set != null) {
+            result = set.compare(e1.getElement(), e2.getElement());
+            ///ystem.err.println(result);
+            if(result == 0 && v1 != null && v2 != null) {
+                // Finally we compare the values alphabetically.
+                result = v1.compareTo(v2);
+            }
+            }
+            else {
+            return 0;
             }
         }