add null checks to parse routine

Author: richard-jones

src/main/java/org/openarchives/resourcesync/ResourceSyncDocument.java

@@ -117,19 +117,22 @@ protected void populateDocument(Element element)
         // metadata element
         Element mdElement = element.getChild("md", ResourceSync.NS_RS);
 
-        // - capability
-        String capability = mdElement.getAttributeValue("capability", ResourceSync.NS_RS);
-        if (!"".equals(capability))
+        if (mdElement != null)
         {
-            this.capability = capability;
-        }
+            // - capability
+            String capability = mdElement.getAttributeValue("capability", ResourceSync.NS_RS);
+            if (!"".equals(capability))
+            {
+                this.capability = capability;
+            }
 
-        // - modified
-        String modified = mdElement.getAttributeValue("modified", ResourceSync.NS_ATOM);
-        if (modified != null && !"".equals(modified))
-        {
-            Date lastMod = ResourceSync.DATE_FORMAT.parse(modified);
-            this.setLastModified(lastMod);
+            // - modified
+            String modified = mdElement.getAttributeValue("modified", ResourceSync.NS_ATOM);
+            if (modified != null && !"".equals(modified))
+            {
+                Date lastMod = ResourceSync.DATE_FORMAT.parse(modified);
+                this.setLastModified(lastMod);
+            }
         }
 
         // rs:ln elements

src/main/java/org/openarchives/resourcesync/ResourceSyncEntry.java

@@ -181,47 +181,50 @@ public void populateObject(Element element)
         // the metadata element
         Element mdElement = element.getChild("md", ResourceSync.NS_RS);
 
-        // - capability
-        String capability = mdElement.getAttributeValue("capability", ResourceSync.NS_RS);
-        if (capability != null && !"".equals(capability))
+        if (mdElement != null)
         {
-            this.setCapability(capability);
-        }
+            // - capability
+            String capability = mdElement.getAttributeValue("capability", ResourceSync.NS_RS);
+            if (capability != null && !"".equals(capability))
+            {
+                this.setCapability(capability);
+            }
 
-        // - change
-        String change = mdElement.getAttributeValue("change", ResourceSync.NS_RS);
-        if (change != null && !"".equals(change))
-        {
-            this.setChange(change);
-        }
+            // - change
+            String change = mdElement.getAttributeValue("change", ResourceSync.NS_RS);
+            if (change != null && !"".equals(change))
+            {
+                this.setChange(change);
+            }
 
-        // - hash
-        String hashAttr = mdElement.getAttributeValue("hash", ResourceSync.NS_ATOM);
-        if (hashAttr != null && !"".equals(hashAttr))
-        {
-            this.addHashesFromAttr(hashAttr);
-        }
+            // - hash
+            String hashAttr = mdElement.getAttributeValue("hash", ResourceSync.NS_ATOM);
+            if (hashAttr != null && !"".equals(hashAttr))
+            {
+                this.addHashesFromAttr(hashAttr);
+            }
 
-        // - length
-        String length = mdElement.getAttributeValue("length", ResourceSync.NS_ATOM);
-        if (length != null && !"".equals(length))
-        {
-            long l = Long.parseLong(length);
-            this.setLength(l);
-        }
+            // - length
+            String length = mdElement.getAttributeValue("length", ResourceSync.NS_ATOM);
+            if (length != null && !"".equals(length))
+            {
+                long l = Long.parseLong(length);
+                this.setLength(l);
+            }
 
-        // - path
-        String path = mdElement.getAttributeValue("path", ResourceSync.NS_RS);
-        if (path != null && !"".equals(path))
-        {
-            this.setPath(path);
-        }
+            // - path
+            String path = mdElement.getAttributeValue("path", ResourceSync.NS_RS);
+            if (path != null && !"".equals(path))
+            {
+                this.setPath(path);
+            }
 
-        // - type
-        String type = mdElement.getAttributeValue("type", ResourceSync.NS_ATOM);
-        if (type != null && !"".equals(type))
-        {
-            this.setType(type);
+            // - type
+            String type = mdElement.getAttributeValue("type", ResourceSync.NS_ATOM);
+            if (type != null && !"".equals(type))
+            {
+                this.setType(type);
+            }
         }
 
         // all the rs:ln elements