aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
diff options
context:
space:
mode:
authorDaniel Gultsch <inputmice@siacs.eu>2015-01-09 14:42:58 +0100
committerDaniel Gultsch <inputmice@siacs.eu>2015-01-09 14:42:58 +0100
commit0a48f777acefa29443743f68f242136309169ba2 (patch)
tree80985e1c8f7962bc9a157fd561ea75ed7b34e38e /src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
parentd9f88c4669b024530301fe9e48d70d42bd56190f (diff)
code cleanup for jingle proxy discovery
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java')
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
index 281ea3ca..dcadb92f 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
@@ -85,8 +85,7 @@ public class JingleCandidate {
}
public boolean equalValues(JingleCandidate other) {
- return other.getHost().equals(this.getHost())
- && (other.getPort() == this.getPort());
+ return other != null && other.getHost().equals(this.getHost()) && (other.getPort() == this.getPort());
}
public boolean isOurs() {