From 80e2c82249bc5192ed1497716840edda9b97051e Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Thu, 24 Dec 2015 02:00:45 +0100
Subject: [PATCH] fix NPE on empty blog importfile parameter

---
 htroot/Blog.html                    | 18 +++++++++---------
 htroot/BlogComments.html            | 12 ++++++------
 source/net/yacy/data/BlogBoard.java | 23 ++++++++++++-----------
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/htroot/Blog.html b/htroot/Blog.html
index 39af1537a..baae0ff90 100644
--- a/htroot/Blog.html
+++ b/htroot/Blog.html
@@ -77,9 +77,9 @@
           </dd>
         </dl>
         <input type="hidden" name="page" value="#[pageid]#" />
-        <input type="submit" name="submit" value="Submit" />
-        <input type="submit" name="preview" value="Preview" />
-        <input type="submit" name="discard" value="Discard" />
+        <input type="submit" name="submit" class="btn btn-primary" value="Submit" />
+        <input type="submit" name="preview" class="btn btn-default" value="Preview" />
+        <input type="submit" name="discard" class="btn btn-danger" value="Discard" />
       </fieldset>
     </form>
     ::
@@ -121,9 +121,9 @@
           </dd>
         </dl>
         <input type="hidden" name="page" value="#[pageid]#" />
-        <input type="submit" name="submit" value="Submit" />
-        <input type="submit" name="preview" value="Preview" />
-        <input type="submit" name="discard" value="Discard" />
+        <input type="submit" name="submit" class="btn btn-primary" value="Submit" />
+        <input type="submit" name="preview" class="btn btn-default" value="Preview" />
+        <input type="submit" name="discard" class="btn btn-danger" value="Discard" />
       </fieldset>
     </form>
     ::
@@ -138,10 +138,10 @@
       <form action="Blog.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
         <input type="hidden" name="delete" value="sure" />
         <input type="hidden" name="page" value="#[pageid]#" />
-        <input type="submit" value="Yes, delete it." />
+        <input type="submit" class="btn btn-danger" value="Yes, delete it." />
       </form>
       <form action="Blog.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
-        <input type="submit" value="No, leave it." />
+        <input type="submit" class="btn btn-primary" value="No, leave it." />
       </form>
     </fieldset>
     ::
@@ -157,7 +157,7 @@
     <form action="Blog.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
       <fieldset>
         <input type="file" size="50" name="xmlfile" />
-        <input type="submit" name="importxml" value="Import" />
+        <input type="submit" name="importxml" class="btn btn-primary" value="Import" />
       </fieldset>
     </form>
     #(/mode)#
diff --git a/htroot/BlogComments.html b/htroot/BlogComments.html
index c78933870..42b8d1e4d 100644
--- a/htroot/BlogComments.html
+++ b/htroot/BlogComments.html
@@ -70,9 +70,9 @@
               </dd>
             </dl>
             <input type="hidden" name="page" value="#[pageid]#" />
-            <input type="submit" name="submit" value="Submit" />
-            <input type="submit" name="preview" value="Preview" />
-            <input type="submit" name="view" value="Discard" />
+            <input type="submit" name="submit" class="btn btn-primary" value="Submit" />
+            <input type="submit" name="preview" class="btn btn-default" value="Preview" />
+            <input type="submit" name="view" class="btn btn-danger" value="Discard" />
           </fieldset>
         </form>
       #(/allow)#
@@ -109,9 +109,9 @@
           </dl>
           <input type="hidden" name="page" value="#[pageid]#" />
           <!-- <input type="text" name="page" value="#[pageid]#" /> -->
-          <input type="submit" name="submit" value="Submit" />
-          <input type="submit" name="preview" value="Preview" />
-          <input type="submit" name="view" value="Discard" />
+          <input type="submit" name="submit" class="btn btn-primary" value="Submit" />
+          <input type="submit" name="preview" class="btn btn-default" value="Preview" />
+          <input type="submit" name="view" class="btn btn-danger" value="Discard" />
         </fieldset>
       </form>
       
diff --git a/source/net/yacy/data/BlogBoard.java b/source/net/yacy/data/BlogBoard.java
index f97f7c794..9b28dc1b9 100644
--- a/source/net/yacy/data/BlogBoard.java
+++ b/source/net/yacy/data/BlogBoard.java
@@ -159,18 +159,19 @@ public class BlogBoard {
     }
 
     public boolean importXML(final String input) {
-    	final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-    	try {
-            final DocumentBuilder builder = factory.newDocumentBuilder();
-            return parseXMLimport(builder.parse(new ByteArrayInputStream(UTF8.getBytes(input))));
-        } catch (final ParserConfigurationException ex) {
-            ConcurrentLog.logException(ex);
-        } catch (final SAXException ex) {
-            ConcurrentLog.logException(ex);
-        } catch (final IOException ex) {
-            ConcurrentLog.logException(ex);
+        if (input != null && !input.isEmpty()) {
+            final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            try {
+                final DocumentBuilder builder = factory.newDocumentBuilder();
+                return parseXMLimport(builder.parse(new ByteArrayInputStream(UTF8.getBytes(input))));
+            } catch (final ParserConfigurationException ex) {
+                ConcurrentLog.logException(ex);
+            } catch (final SAXException ex) {
+                ConcurrentLog.logException(ex);
+            } catch (final IOException ex) {
+                ConcurrentLog.logException(ex);
+            }
         }
-
     	return false;
     }