Changeset 29164 for main/trunk

Timestamp:

2014-07-28T12:58:55+12:00 (10 years ago)

Author:

kjdon

Message:

check for null coll_config_xml before trying to modify it for debug, otherwise get null pointer exception. this will happen if you have a folder in collect which is not actually a collection

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java

@@ -117 +117 @@
 
         Element coll_config_xml = loadCollConfigFile();
+        if (coll_config_xml == null) {
+          logger.error("Collection: couldn't configure collection: " + this.cluster_name + ", " + "Couldn't load collection config file");
+
+          return false;
+        }
+        Element build_config_xml = loadBuildConfigFile();
+
+        if (build_config_xml == null)
+        {
+          logger.error("Collection: couldn't configure collection: " + this.cluster_name + ", " + "Couldn't load build config file");
+
+          return false;
+        }
+
         GSXSLT.modifyCollectionConfigForDebug(coll_config_xml);
-        Element build_config_xml = loadBuildConfigFile();
-
-        if (coll_config_xml == null || build_config_xml == null)
-        {
-            return false;
-        }
-
         // get the collection type attribute
         Element search = (Element) GSXML.getChildByTagName(coll_config_xml, GSXML.SEARCH_ELEM);
@@ -193 +200 @@
         if (!coll_config_file.exists())
         {
-            logger.error("Collection: couldn't configure collection: " + this.cluster_name + ", " + coll_config_file + " does not exist");
             return null;
         }