OF-857: Mark connection closed before notifying

The connection close listener initiates a presence broadcast to
advertise its "unavailable" status. The current connection must be
marked closed before this occurs, so the presence stanza will not be
delivered to the newly closed connection.

Note that the synchronized block alone does not accomplish this because
the presence broadcast is delivered via that same thread that is
currently closing the connection, thus it already possesses the sync
object lock.

Also, note that the SessionManager should exclude the originating JID
when sending presence broadcasts to the user's other available
session(s).

src/java/org/jivesoftware/openfire/SessionManager.java

@@ -641,12 +641,14 @@ public class SessionManager extends BasicModule implements ClusterEventListener
         JID searchJID = new JID(originatingResource.getNode(), originatingResource.getDomain(), null);
         List<JID> addresses = routingTable.getRoutes(searchJID, null);
         for (JID address : addresses) {
+        	if (originatingResource != address) {
 	            // Send the presence of the session whose presence has changed to
-            // this other user's session
+	            // this user's other session(s)
 	            presence.setTo(address);
 	            routingTable.routePacket(address, presence, false);
         	}
         }
+    }
 
     /**
      * Notification message sent when a client sent an unavailable presence for the session. Making

src/java/org/jivesoftware/openfire/nio/NIOConnection.java

@@ -215,8 +215,8 @@ public class NIOConnection implements Connection {
             if (session != null) {
                 session.setStatus(Session.STATUS_CLOSED);
             }
-            notifyCloseListeners(); // clean up session, etc.
             closed = true;
+            notifyCloseListeners(); // clean up session, etc.
     	}
         ioSession.close(false); // async via MINA
     }