OF-883 & OF-881: Avoid potential deadlock with close listeners.

The close listeners should not be called from within a synchronized block.

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

@@ -208,46 +208,52 @@ public class NIOConnection implements Connection {
         return backupDeliverer;
     }
 
-    public synchronized void close()
+    public void close()
     {
-        try
-        {
-            if ( state == State.CLOSED )
+        boolean notifyClose = false;
+        synchronized ( this ) {
+            try
             {
-                return;
-            }
+                if ( state == State.CLOSED )
+                {
+                    return;
+                }
 
-            // This prevents any action after the first invocation of close() on this connection.
-            if ( state != State.CLOSING )
-            {
-                state = State.CLOSING;
-                try
+                // This prevents any action after the first invocation of close() on this connection.
+                if ( state != State.CLOSING )
                 {
-                    deliverRawText( flashClient ? "</flash:stream>" : "</stream:stream>" );
+                    state = State.CLOSING;
+                    try
+                    {
+                        deliverRawText( flashClient ? "</flash:stream>" : "</stream:stream>" );
+                    }
+                    catch ( Exception e )
+                    {
+                        // Ignore
+                    }
                 }
-                catch ( Exception e )
+
+                // deliverRawText might already have forced the state from Closing to Closed. In that case, there's no need
+                // to invoke the CloseListeners again.
+                if ( state == State.CLOSING )
                 {
-                    // Ignore
+                    notifyClose = true;
                 }
             }
-
-            // deliverRawText might already have forced the state from Closing to Closed. In that case, there's no need
-            // to invoke the CloseListeners again.
-            if ( state == State.CLOSING )
+            finally
             {
-                // TODO Check for regression of OF-881 (which placed the call below outside of the synchronized block).
-                notifyCloseListeners(); // clean up session, etc.
+                // Ensure that the state of this connection, its session and the MINA context are eventually closed.
+                state = State.CLOSED;
+                if ( session != null )
+                {
+                    session.setStatus( Session.STATUS_CLOSED );
+                }
+                ioSession.close( true );
             }
         }
-        finally
+        if (notifyClose)
         {
-            // Ensure that the state of this connection, its session and the MINA context are eventually closed.
-            state = State.CLOSED;
-            if ( session != null )
-            {
-                session.setStatus( Session.STATUS_CLOSED );
-            }
-            ioSession.close( true );
+            notifyCloseListeners(); // clean up session, etc.
         }
     }