Added some checks for null specification references. Code is now more…

… robust to ill-formed dictionary elements
cdk · Apr 10, 2012 · faa5404 · faa5404
1 parent f2080e1
commit faa5404
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/main/org/openscience/cdk/qsar/DescriptorEngine.java b/src/main/org/openscience/cdk/qsar/DescriptorEngine.java
@@ -23,7 +23,6 @@
 import nu.xom.Attribute;
 import nu.xom.Element;
 import nu.xom.Elements;
-
 import org.openscience.cdk.IImplementationSpecification;
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.annotations.TestMethod;
@@ -411,8 +410,12 @@ public String getDictionaryDefinition(String identifier) {
         Entry[] dictEntries = dict.getEntries();
 
         String specRef = getSpecRef(identifier);
-        String definition = null;
+        if (specRef == null) {
+            logger.error("Cannot determine specification for id: ", identifier);
+            return "";
+        }
 
+        String definition = null;
         for (Entry dictEntry : dictEntries) {
             if (!dictEntry.getClassName().equals("Descriptor")) continue;
             if (dictEntry.getID().equals(specRef.toLowerCase())) {
@@ -448,8 +451,12 @@ public String getDictionaryDefinition(DescriptorSpecification descriptorSpecific
     public String getDictionaryTitle(String identifier) {
         Entry[] dictEntries = dict.getEntries();
         String specRef = getSpecRef(identifier);
-        String title = null;
+        if (specRef == null) {
+            logger.error("Cannot determine specification for id: ", identifier);
+            return "";
+        }
 
+        String title = null;
         for (Entry dictEntry : dictEntries) {
             if (!dictEntry.getClassName().equals("Descriptor")) continue;
             if (dictEntry.getID().equals(specRef.toLowerCase())) {