aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-07-29 16:26:54 +0200
committerChristian Schneppe <christian@pix-art.de>2018-07-29 16:26:54 +0200
commitfee8f42d83e1dd964b8432c0ee6da308ae347dcc (patch)
treeda1c5bb0388d2e6eb35e359d23f1becfdf019133 /src/main/java/de/pixart
parent75075e5ca85382c2f8ff6978a955c8159340f2b6 (diff)
null pointer check in notification service
Diffstat (limited to 'src/main/java/de/pixart')
-rw-r--r--src/main/java/de/pixart/messenger/services/NotificationService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java
index 9f8438de3..7fa091478 100644
--- a/src/main/java/de/pixart/messenger/services/NotificationService.java
+++ b/src/main/java/de/pixart/messenger/services/NotificationService.java
@@ -181,7 +181,7 @@ public class NotificationService {
public void push(final Message message) {
synchronized (CATCHUP_LOCK) {
final XmppConnection connection = message.getConversation().getAccount().getXmppConnection();
- if (connection.isWaitingForSmCatchup()) {
+ if (connection != null && connection.isWaitingForSmCatchup()) {
connection.incrementSmCatchupMessageCounter();
pushFromBacklog(message);
} else {