narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

make sure to properly stop tagwriter

Browse source
This commit is contained in:
Daniel Gultsch 2017-01-22 12:54:39 +01:00
parent 5dde977233
commit b72d7ec8d0
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/eu/siacs/conversations/xml/TagWriter.java
View file

@ -99,6 +99,13 @@ public class TagWriter {
public void forceClose() {
finish();
if (outputStream != null) {
try {
outputStream.close();
} catch (IOException e) {
//ignoring
}
}
outputStream = null;
}
}

2
src/main/java/eu/siacs/conversations/xml/XmlReader.java
View file

@ -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 {

4
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -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()) {