From c8631cf45cb5c4e0b9bd7b7a52af0ba5cc30f878 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Mon, 29 Dec 2014 18:20:11 +0100
Subject: [PATCH] Use entries.containsKey in Roster

---
 .../src/main/java/org/jivesoftware/smack/Roster.java   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/smack-core/src/main/java/org/jivesoftware/smack/Roster.java b/smack-core/src/main/java/org/jivesoftware/smack/Roster.java
index 5d98ee735..e6c11fde6 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/Roster.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/Roster.java
@@ -850,7 +850,6 @@ public class Roster {
             String from = presence.getFrom();
             String key = getPresenceMapKey(from);
             Map<String, Presence> userPresences;
-            RosterEntry entry;
             Presence response = null;
 
             // If an "available" presence, add it to the presence map. Each presence
@@ -872,8 +871,7 @@ public class Roster {
                 // Add the new presence, using the resources as a key.
                 userPresences.put(XmppStringUtils.parseResource(from), presence);
                 // If the user is in the roster, fire an event.
-                entry = entries.get(key);
-                if (entry != null) {
+                if (entries.containsKey(key)) {
                     fireRosterPresenceEvent(presence);
                 }
                 break;
@@ -900,8 +898,7 @@ public class Roster {
                     userPresences.put(XmppStringUtils.parseResource(from), presence);
                 }
                 // If the user is in the roster, fire an event.
-                entry = entries.get(key);
-                if (entry != null) {
+                if (entries.containsKey(key)) {
                     fireRosterPresenceEvent(presence);
                 }
                 break;
@@ -954,8 +951,7 @@ public class Roster {
                 // Set the new presence using the empty resource as a key.
                 userPresences.put("", presence);
                 // If the user is in the roster, fire an event.
-                entry = entries.get(key);
-                if (entry != null) {
+                if (entries.containsKey(key)) {
                     fireRosterPresenceEvent(presence);
                 }
                 break;