aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-25 17:06:20 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-25 17:06:20 +0200
commitb0a3c717d21ffc0c17aa123c171cce29e01d2884 (patch)
treecace210de18fddfe191700501d14c58f5bfa9783
parentdfbc42ecd795b8e5138f3dc123cdbbf8bf685209 (diff)
wrap wakelock release with try catch
-rw-r--r--src/eu/siacs/conversations/services/XmppConnectionService.java2
-rw-r--r--src/eu/siacs/conversations/xml/XmlReader.java4
-rw-r--r--src/eu/siacs/conversations/xmpp/XmppConnection.java8
3 files changed, 7 insertions, 7 deletions
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index 6e36c9bc..f4691fab 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -510,7 +510,7 @@ public class XmppConnectionService extends Service {
}
}
if (wakeLock.isHeld()) {
- wakeLock.release();
+ try { wakeLock.release();} catch (RuntimeException re) {}
}
return START_STICKY;
}
diff --git a/src/eu/siacs/conversations/xml/XmlReader.java b/src/eu/siacs/conversations/xml/XmlReader.java
index b4b1647e..01a9e2d8 100644
--- a/src/eu/siacs/conversations/xml/XmlReader.java
+++ b/src/eu/siacs/conversations/xml/XmlReader.java
@@ -51,7 +51,7 @@ public class XmlReader {
public Tag readTag() throws XmlPullParserException, IOException {
if (wakeLock.isHeld()) {
- wakeLock.release();
+ try { wakeLock.release();} catch (RuntimeException re) {}
}
try {
while(parser.next() != XmlPullParser.END_DOCUMENT) {
@@ -75,7 +75,7 @@ public class XmlReader {
}
}
if (wakeLock.isHeld()) {
- wakeLock.release();
+ try { wakeLock.release();} catch (RuntimeException re) {}
}
} catch (ArrayIndexOutOfBoundsException e) {
throw new IOException("xml parser mishandled ArrayIndexOufOfBounds", e);
diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index 2447b49b..4fc64590 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -183,7 +183,7 @@ public class XmppConnection implements Runnable {
} catch (UnknownHostException e) {
this.changeStatus(Account.STATUS_SERVER_NOT_FOUND);
if (wakeLock.isHeld()) {
- wakeLock.release();
+ try { wakeLock.release();} catch (RuntimeException re) {}
}
return;
} catch (IOException e) {
@@ -191,21 +191,21 @@ public class XmppConnection implements Runnable {
this.changeStatus(Account.STATUS_OFFLINE);
}
if (wakeLock.isHeld()) {
- wakeLock.release();
+ try { wakeLock.release();} catch (RuntimeException re) {}
}
return;
} catch (NoSuchAlgorithmException e) {
this.changeStatus(Account.STATUS_OFFLINE);
Log.d(LOGTAG, "compression exception " + e.getMessage());
if (wakeLock.isHeld()) {
- wakeLock.release();
+ try { wakeLock.release();} catch (RuntimeException re) {}
}
return;
} catch (XmlPullParserException e) {
this.changeStatus(Account.STATUS_OFFLINE);
Log.d(LOGTAG, "xml exception " + e.getMessage());
if (wakeLock.isHeld()) {
- wakeLock.release();
+ try { wakeLock.release();} catch (RuntimeException re) {}
}
return;
}