svn commit: r1347645 - /mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterUtils.java

[be...@apache.org]

Author: berndf
Date: Thu Jun  7 14:40:39 2012
New Revision: 1347645

URL: http://svn.apache.org/viewvc?rev=1347645&view=rev
Log:
really, tolerate RosterManager's absense

Modified:
    mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterUtils.java

Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterUtils.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterUtils.java?rev=1347645&r1=1347644&r2=1347645&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterUtils.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterUtils.java Thu Jun  7 14:40:39 2012
@@ -53,7 +53,6 @@ public class RosterUtils {
      * are needed and then all TO items - but the roster is only iterated once. 
      */
     public static Map<SubscriptionType, List<RosterItem>> getRosterItemsByState(RosterManager rosterManager, Entity user) {
-        if (rosterManager == null) return Collections.emptyMap();
         
         Map<SubscriptionType, List<RosterItem>> rosterItemMap = new HashMap<SubscriptionType, List<RosterItem>>();
 
@@ -63,6 +62,8 @@ public class RosterUtils {
         rosterItemMap.put(SubscriptionType.REMOVE, new ArrayList<RosterItem>());
         rosterItemMap.put(SubscriptionType.NONE, new ArrayList<RosterItem>());
 
+        if (rosterManager == null) return rosterItemMap;
+        
         Roster roster;
         try {
             roster = rosterManager.retrieve(user);