Missed handling of exception. Properly closed now.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/branches@5742 b35dd754-fafc-0310-a699-88a17e54d16e

httpbind_branch/src/java/org/jivesoftware/wildfire/http/HttpBindServlet.java

@@ -14,6 +14,7 @@ import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParserException;
 import org.jivesoftware.util.Log;
 import org.jivesoftware.wildfire.net.MXParser;
+import org.jivesoftware.wildfire.auth.UnauthorizedException;
 import org.dom4j.io.XMPPPacketReader;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
@@ -146,9 +147,18 @@ public class HttpBindServlet extends HttpServlet {
             return;
         }
 
-        HttpConnection connection = new HttpConnection(rid, request.isSecure());
-        connection.setSession(sessionManager.createSession(rootNode, connection));
-        respond(response, connection);
+
+        try {
+            HttpConnection connection = new HttpConnection(rid, request.isSecure());
+            connection.setSession(sessionManager.createSession(rootNode, connection));
+            respond(response, connection);
+        }
+        catch (UnauthorizedException e) {
+            // Server wasn't initialized yet.
+            response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+                    "Server Not initialized");
+        }
+
     }
 
     private void respond(HttpServletResponse response, HttpConnection connection)

httpbind_branch/src/java/org/jivesoftware/wildfire/http/HttpSession.java

@@ -135,10 +135,10 @@ public class HttpSession extends ClientSession {
     }
 
     public void close() {
-        close(false);
+        conn.close();
     }
 
-    public synchronized void close(boolean isServerShuttingDown) {
+    private synchronized void close(boolean isServerShuttingDown) {
         if(isClosed) {
             return;
         }

httpbind_branch/src/java/org/jivesoftware/wildfire/http/HttpSessionManager.java

@@ -187,10 +187,10 @@ public class HttpSessionManager {
                 router.route(packet);
             }
             catch (UnsupportedEncodingException e) {
-                e.printStackTrace();
+                throw new HttpBindException("Bad auth request, unknown encoding", true, 400);
             }
             catch (UnknownStanzaException e) {
-                e.printStackTrace();
+                throw new HttpBindException("Unknown packet type.", false, 400);
             }
         }
 
@@ -227,7 +227,7 @@ public class HttpSessionManager {
         }
 
         public void run() {
-            session.close(false);
+            session.close();
         }
     }
 }