From b06c3e36076eeac7dd34e7f4cd7cd1b7c386ee45 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Mon, 19 Jan 2015 18:36:31 +0100
Subject: [PATCH] Use getPresenceMapKey() in Roster.getEntry()

In order to use the bare JID as key for the entries Map if no entry for
the full JID exists already, otherwise use the full JID.
---
 smack-core/src/main/java/org/jivesoftware/smack/Roster.java | 5 +++--
 1 file changed, 3 insertions(+), 2 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 9739e7f4f..21bd06756 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/Roster.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/Roster.java
@@ -448,7 +448,8 @@ public class Roster {
         if (user == null) {
             return null;
         }
-        return entries.get(user.toLowerCase(Locale.US));
+        String key = getPresenceMapKey(user);
+        return entries.get(key);
     }
 
     /**
@@ -714,7 +715,7 @@ public class Roster {
             return null;
         }
         String key = user;
-        if (!contains(user)) {
+        if (!entries.containsKey(user)) {
             key = XmppStringUtils.parseBareJid(user);
         }
         return key.toLowerCase(Locale.US);