diff options
Diffstat (limited to 'juick-xmpp/src/main')
| -rw-r--r-- | juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionIn.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionIn.java b/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionIn.java index 3304f73f..60268284 100644 --- a/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionIn.java +++ b/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionIn.java @@ -106,8 +106,13 @@ public class ConnectionIn extends Connection implements Runnable { updateTsRemoteData(); boolean valid = false; if (vfrom != null && vto != null && vid != null && vkey != null) { - String dialbackKey = xmpp.getConnectionOut(vfrom, false).dbKey; - valid = vkey.equals(dialbackKey); + ConnectionOut c = xmpp.getConnectionOut(vfrom, false); + if (c == null) { + logger.warn("outgoing connection to {} not found", vfrom); + } else { + String dialbackKey = c.dbKey; + valid = vkey.equals(dialbackKey); + } } if (valid) { sendStanza("<db:verify from='" + vto + "' to='" + vfrom + "' id='" + vid + "' type='valid'/>"); |