[JM-1366] HTTP sessions dieing by timeout now clean up properly.

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

src/java/org/jivesoftware/openfire/http/HttpSession.java

@@ -155,10 +155,7 @@ public class HttpSession extends LocalClientSession {
      * on the session ID.
      */
     public void close() {
-        if (isClosed) {
-            return;
-        }
-        conn.close();
+        closeConnection();
     }
 
     /**
@@ -667,6 +664,8 @@ public class HttpSession extends LocalClientSession {
         }
         isClosed = true;
 
+        conn.close();
+
         if (pendingElements.size() > 0) {
             failDelivery();
         }