Changeset 4419

Timestamp:

2003-05-30T12:43:44+12:00 (21 years ago)

Author:

jmt12

Message:

2030092: Furthermore it doesn't throw an NPE during GLI exit due to it trying to look something up in a non-existant metadata set manager.

File:

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

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

@@ -847 +847 @@
         Metadata m1 = (Metadata) o1;
         Metadata m2 = (Metadata) o2;
-                ///ystem.err.println("MSMUtils.compare(" + m1 + ", " + m2 + ") = ");
+        ///ystem.err.println("MSMUtils.compare(" + m1 + ", " + m2 + ") = ");
         ElementWrapper e1 = m1.getElement();
         ElementWrapper e2 = m2.getElement();
-                // First we compare the namespaces
+        // First we compare the namespaces
         result = e1.getNamespace().compareTo(e2.getNamespace());
-        if(result == 0) {
+        if(result == 0 && Gatherer.c_man != null && Gatherer.c_man.ready() && e1.getNamespace() != null) {
         // Now, given both elements are in the same set, we compare the element ordering using methods in MetadataSet
         MetadataSet set = Gatherer.c_man.getCollection().msm.getSet(e1.getNamespace());