Fixed concurrency problem. JM-276

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1307 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/messenger/SessionManager.java

@@ -135,9 +135,9 @@ public class SessionManager extends BasicModule {
          */
         void addSession(ClientSession session) {
             String resource = session.getAddress().getResource();
-            resources.put(resource, session);
             Presence presence = session.getPresence();
             int priority = presence == null ? 0 : presence.getPriority();
+            resources.put(resource, session);
             sortSession(resource, priority);
         }
 
@@ -148,12 +148,12 @@ public class SessionManager extends BasicModule {
          * @param priority The priority to use for sorting
          */
         private void sortSession(String resource, int priority) {
-
+            synchronized (priorityList) {
                 if (priorityList.size() > 0) {
                     Iterator iter = priorityList.iterator();
                     for (int i = 0; iter.hasNext(); i++) {
                         ClientSession sess = resources.get(iter.next());
-                    if (sess.getPresence().getPriority() <= priority) {
+                        if (sess != null && sess.getPresence().getPriority() <= priority) {
                             priorityList.add(i, resource);
                             break;
                         }
@@ -163,6 +163,7 @@ public class SessionManager extends BasicModule {
                     priorityList.addLast(resource);
                 }
             }
+        }
 
         /**
          * Change the priority of a session associated with the sender.
@@ -173,10 +174,12 @@ public class SessionManager extends BasicModule {
         public void changePriority(JID sender, int priority) {
             String resource = sender.getResource();
             if (resources.containsKey(resource)) {
+                synchronized (priorityList) {
                     priorityList.remove(resource);
                     sortSession(resource, priority);
                 }
             }
+        }
 
         /**
          * Remove a session from the manager.
@@ -186,8 +189,10 @@ public class SessionManager extends BasicModule {
         void removeSession(Session session) {
             String resource = session.getAddress().getResource();
             resources.remove(resource);
+            synchronized (priorityList) {
                 priorityList.remove(resource);
             }
+        }
 
         /**
          * Gets the session for the given resource.
@@ -227,12 +232,14 @@ public class SessionManager extends BasicModule {
                 return resources.get(priorityList.getFirst());
             }
             else {
+                synchronized (priorityList) {
                     for (int i=0; i < priorityList.size(); i++) {
                         ClientSession s = resources.get(priorityList.get(i));
-                    if (s.getPresence().isAvailable()) {
+                        if (s != null && s.getPresence().isAvailable()) {
                             return s;
                         }
                     }
+                }
                 return null;
             }
         }