Changeset 13175

Timestamp:

2006-10-27T15:02:29+13:00 (17 years ago)

Author:

mdewsnip

Message:

Added a check to prevent a NPE and display an error message when plugin/classifier options XML couldn't be parsed.

Location:

trunk/gli/src/org/greenstone/gatherer/greenstone

Files:

• Classifiers.java (modified) (1 diff)
• Plugins.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/greenstone/Classifiers.java

@@ -239 +239 @@
     {
     Document document = XMLTools.parseXML(new StringReader(xml));
+    if (document == null) {
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.ClassifierManager.Classifier_XML_Parse_Failed", classifier.getName()), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        return;
+    }
+
     parseClassifierInfoXMLNode(classifier, document.getDocumentElement());
     }

trunk/gli/src/org/greenstone/gatherer/greenstone/Plugins.java

@@ -240 +240 @@
     {
     Document document = XMLTools.parseXML(new StringReader(xml));
+    if (document == null) {
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", plugin.getName()), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        return;
+    }
+
     parsePluginInfoXMLNode(plugin, document.getDocumentElement());
     }