Merge pull request #219 from guusdk/OF-883

OF-883: Compensate for new half-duplex close of TCP channel in MINA

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

@@ -107,6 +107,14 @@ public abstract class ConnectionHandler extends IoHandlerAdapter {
         }
     }
 
+    @Override
+    public void inputClosed( IoSession session ) throws Exception {
+        // Get the connection for this session
+        Connection connection = (Connection) session.getAttribute(CONNECTION);
+        // Inform the connection that it was closed
+        connection.close();
+    }
+
     @Override
 	public void sessionClosed(IoSession session) throws Exception {
         // Get the connection for this session

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

@@ -222,7 +222,7 @@ public class NIOConnection implements Connection {
     			return;
     		}
             try {
-                deliverRawText(flashClient ? "</flash:stream>" : "</stream:stream>", false);
+                deliverRawText(flashClient ? "</flash:stream>" : "</stream:stream>", true);
             } catch (Exception e) {
                 // Ignore
             }
@@ -235,7 +235,7 @@ public class NIOConnection implements Connection {
     	// OF-881: Notify any close listeners after the synchronized block has completed. 
     	notifyCloseListeners(); // clean up session, etc.
     	
-        ioSession.close(false); // async via MINA
+        ioSession.close(true); // sync via MINA
     }
 
     public void systemShutdown() {