[utilities COMMIT] /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Mar 13 21:45:20 2015
New Revision: 778

URL: http://svn.shibboleth.net/view/utilities?rev=778&view=rev
Log:
JSPT-56: Various ParserPool interface methods are annotated @Nonnull, this needs to be enforced in the BasicParserPool impl

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java?rev=778&r1=777&r2=778&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java Fri Mar 13 21:45:20 2015
@@ -168,7 +168,7 @@
             return new DocumentBuilderProxy(builder, this);
         }
 
-        return null;
+        throw new XMLParserException("Unable to obtain a DocumentBuilder");
     }
 
     /** {@inheritDoc} */
@@ -222,6 +222,10 @@
         } finally {
             returnBuilder(builder);
         }
+        
+        if (document == null) {
+            throw new XMLParserException("DocumentBuilder returned a null Document");
+        }
 
         return document;
     }
@@ -236,6 +240,9 @@
         final DocumentBuilder builder = getBuilder();
         try {
             final Document document = builder.parse(input);
+            if (document == null) {
+                throw new XMLParserException("DocumentBuilder parsed a null Document");
+            }
             return document;
         } catch (SAXException e) {
             throw new XMLParserException("Unable to parse inputstream, it contained invalid XML", e);
@@ -256,6 +263,9 @@
         final DocumentBuilder builder = getBuilder();
         try {
             final Document document = builder.parse(new InputSource(input));
+            if (document == null) {
+                throw new XMLParserException("DocumentBuilder parsed a null Document");
+            }
             return document;
         } catch (SAXException e) {
             throw new XMLParserException("Invalid XML", e);