Manually apply #178, report NPEs more explicitly

ndw · Mar 4, 2018 · f19da5c · f19da5c
1 parent b72e2f3
commit f19da5c
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/main/java/com/xmlcalabash/extensions/Zip.java b/src/main/java/com/xmlcalabash/extensions/Zip.java
@@ -143,6 +143,9 @@ public void run() throws SaxonApiException {
         final String zipFn = getOption(_href).getString();
 
         XdmNode man = S9apiUtils.getDocumentElement(manifest.read());
+        if (man == null) {
+            throw new NullPointerException("XML document " + man.getDocumentURI() + " has no root element.");
+        }
 
         if (!c_zip_manifest.equals(man.getNodeName())) {
             throw new XProcException(step.getNode(), "The cx:zip manifest must be a c:zip-manifest.");
@@ -151,6 +154,9 @@ public void run() throws SaxonApiException {
         while (source.moreDocuments()) {
             XdmNode doc = source.read();
             XdmNode root = S9apiUtils.getDocumentElement(doc);
+            if (root == null) {
+                throw new NullPointerException("XML document " + doc.getDocumentURI() + " has no root element.");
+            }
             srcManifest.put(root.getBaseURI().toASCIIString(), doc);
         }