make sure to properly stop tagwriter

2 files changed, 8 insertions, 1 deletions

diff --git a/src/main/java/de/pixart/messenger/xml/TagWriter.java b/src/main/java/de/pixart/messenger/xml/TagWriter.java
index 0a663ce1b..c96841d56 100644
--- a/src/main/java/de/pixart/messenger/xml/TagWriter.java
+++ b/src/main/java/de/pixart/messenger/xml/TagWriter.java
@@ -99,6 +99,13 @@ public class TagWriter {
 
     public void forceClose() {
         finish();
+        if (outputStream != null) {
+            try {
+                outputStream.close();
+            } catch (IOException e) {
+                //ignoring
+            }
+        }
         outputStream = null;
     }
 }
diff --git a/src/main/java/de/pixart/messenger/xml/XmlReader.java b/src/main/java/de/pixart/messenger/xml/XmlReader.java
index 3c8cfa1f2..efd4dcc95 100644
--- a/src/main/java/de/pixart/messenger/xml/XmlReader.java
+++ b/src/main/java/de/pixart/messenger/xml/XmlReader.java
@@ -82,7 +82,7 @@ public class XmlReader {
             }
 
         } catch (Throwable throwable) {
-            throw new IOException("xml parser mishandled " + throwable.getClass().getName(), throwable);
+            throw new IOException("xml parser mishandled " + throwable.getClass().getSimpleName() + "(" + throwable.getMessage() + ")", throwable);
         } finally {
             if (wakeLock.isHeld()) {
                 try {