aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-01 14:33:34 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-01 14:33:34 +0100
commit1ea2e7dc3b3f9080ab55e1712c737ae9685d7791 (patch)
tree8584aa528ad43507af620a482de16155095d8fad /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
parenta0f694ea44b9d68390846b48d720f9a37fd679b8 (diff)
fixed arrayoutofbounds + spelling
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index be73e07f..ea6f509f 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1935,7 +1935,7 @@ public class XmppConnectionService extends Service {
Message current = message;
while(current.getStatus() == Message.STATUS_SEND_FAILED) {
messages.add(current);
- if (current.mergable(current.next())) {
+ if (current.mergeable(current.next())) {
current = current.next();
} else {
break;