From 89d5f877c153dbcd2fc6c70f1da9094f5295e650 Mon Sep 17 00:00:00 2001 From: Jeremy Lakeman Date: Tue, 20 Jun 2017 16:31:56 +0930 Subject: [PATCH] Treat Subscribers as the same only if they have the same signing key --- java-api/src/org/servalproject/servaldna/Subscriber.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java-api/src/org/servalproject/servaldna/Subscriber.java b/java-api/src/org/servalproject/servaldna/Subscriber.java index 181d30b5..53ad32a6 100644 --- a/java-api/src/org/servalproject/servaldna/Subscriber.java +++ b/java-api/src/org/servalproject/servaldna/Subscriber.java @@ -43,6 +43,8 @@ public final class Subscriber { if (o == null || getClass() != o.getClass()) return false; Subscriber that = (Subscriber) o; + if (that.signingKey!=null && this.signingKey!=null) + return signingKey.equals(that.signingKey); return sid.equals(that.sid); }