From b72d7ec8d0627a30f59c5ace977a6cfce468da2a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 22 Jan 2017 12:54:39 +0100
Subject: [PATCH] make sure to properly stop tagwriter

---
 src/main/java/eu/siacs/conversations/xml/TagWriter.java    | 7 +++++++
 src/main/java/eu/siacs/conversations/xml/XmlReader.java    | 2 +-
 .../java/eu/siacs/conversations/xmpp/XmppConnection.java   | 4 +++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/xml/TagWriter.java b/src/main/java/eu/siacs/conversations/xml/TagWriter.java
index 9d16c338c..c0fc1a139 100644
--- a/src/main/java/eu/siacs/conversations/xml/TagWriter.java
+++ b/src/main/java/eu/siacs/conversations/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/eu/siacs/conversations/xml/XmlReader.java b/src/main/java/eu/siacs/conversations/xml/XmlReader.java
index 1e6b89d34..58ef07f97 100644
--- a/src/main/java/eu/siacs/conversations/xml/XmlReader.java
+++ b/src/main/java/eu/siacs/conversations/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 {
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 08dbdc183..ef5ff854c 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -1356,6 +1356,9 @@ public class XmppConnection implements Runnable {
 	}
 
 	private void forceCloseSocket() {
+		if (tagWriter != null) {
+			tagWriter.forceClose();
+		}
 		if (socket != null) {
 			try {
 				socket.close();
@@ -1375,7 +1378,6 @@ public class XmppConnection implements Runnable {
 		interrupt();
 		Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": disconnecting force="+Boolean.valueOf(force));
 		if (force) {
-			tagWriter.forceClose();
 			forceCloseSocket();
 		} else {
 			if (tagWriter.isActive()) {