Some minor cleanup.

Fix problems with xhr-polling.

Author: tadglines

core/src/main/java/com/glines/socketio/server/SocketIOInbound.java

@@ -42,8 +42,6 @@ interface SocketIOOutbound {
 		 * Initiate an orderly close of the connection. The state will be changed to CLOSING so no
 		 * new messages can be sent, but messages may still arrive until the distant end has
 		 * acknowledged the close.
-		 * 
-		 * @param closeType
 		 */
 		void close();
 
@@ -63,9 +61,10 @@ interface SocketIOOutbound {
 		/**
 		 * Send a message.
 		 * 
-		 * @param message
+		 * @param messageType
+         * @param message
 		 * @throws IllegalStateException if the socket is not CONNECTED.
-		 * @throws SocketIOMessageParserException if the message type parser encode() failed.
+		 * @throws SocketIOException
 		 */
 		void sendMessage(int messageType, String message) throws SocketIOException;
 	}
@@ -98,7 +97,6 @@ interface SocketIOOutbound {
 	 * Called one per arriving message.
 	 * @param messageType
 	 * @param message
-	 * @param parseError
 	 */
 	void onMessage(int messageType, String message);
 }

core/src/main/java/com/glines/socketio/server/SocketIOSession.java

@@ -109,7 +109,7 @@ interface SessionTask {
 
 	/**
 	 * Pass disconnect through to contained SocketIOInbound and update any internal state.
-	 * @param message
+	 * @param reason
 	 */
 	void onDisconnect(DisconnectReason reason);
 

core/src/main/java/com/glines/socketio/server/transport/AbstractHttpTransport.java

@@ -74,11 +74,12 @@ public void handle(HttpServletRequest request,
 
 		Object obj = request.getAttribute(SESSION_KEY);
 		SocketIOSession session = null;
+		String sessionId = null;
 		if (obj != null) {
 			session = (SocketIOSession)obj;
 		} else {
-			String sessionId = extractSessionId(request);
-			if (sessionId != null) {
+			sessionId = extractSessionId(request);
+			if (sessionId != null && sessionId.length() > 0) {
 				session = sessionFactory.getSession(sessionId);
 			}
 		}
@@ -89,16 +90,18 @@ public void handle(HttpServletRequest request,
 				handler.handle(request, response, session);
 			} else {
 				session.onShutdown();
-	    		response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+				response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 			}
+		} else if (sessionId != null && sessionId.length() > 0) {
+			response.sendError(HttpServletResponse.SC_BAD_REQUEST);
 		} else {
 			if ("GET".equals(request.getMethod())) {
-	 			session = connect(request, response, inboundFactory, sessionFactory);
-	 			if (session == null) {
-	 				response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
-	 			}
+				session = connect(request, response, inboundFactory, sessionFactory);
+				if (session == null) {
+					response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
+				}
 			} else {
- 				response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+				response.sendError(HttpServletResponse.SC_BAD_REQUEST);
 			}
 		}
 	}

core/src/main/java/com/glines/socketio/server/transport/WebSocketTransport.java

@@ -68,11 +68,6 @@ public void onConnect(final Outbound outbound) {
 			this.outbound = outbound;
 		}
 
-        @Override
-        public void onFragment(boolean more, byte opcode, byte[] data, int offset, int length) {
-            throw new UnsupportedOperationException();
-        }
-
         /*
            * (non-Javadoc)
            * @see org.eclipse.jetty.websocket.WebSocket#onDisconnect()
@@ -129,6 +124,11 @@ public void onMessage(byte frame, byte[] data, int offset, int length) {
             }
 		}
 
+        @Override
+        public void onFragment(boolean more, byte opcode, byte[] data, int offset, int length) {
+            throw new UnsupportedOperationException();
+        }
+
 		/*
 		 * (non-Javadoc)
 		 * @see com.glines.socketio.SocketIOInbound.SocketIOOutbound#disconnect()

core/src/main/java/com/glines/socketio/server/transport/XHRMultipartTransport.java

@@ -57,8 +57,6 @@ private class XHRMultipartSessionHelper extends XHRSessionHelper {
 		protected void startSend(HttpServletResponse response) throws IOException {
 			response.setContentType(contentType);
 			response.setHeader("Connection", "keep-alive");
-			char[] spaces = new char[244];
-			Arrays.fill(spaces, ' ');
 			ServletOutputStream os = response.getOutputStream();
 			os.print(boundarySeperator);
 			response.flushBuffer();

core/src/main/java/com/glines/socketio/server/transport/XHRTransport.java

@@ -119,7 +119,7 @@ public void sendMessage(SocketIOFrame frame)
 						} catch (IOException e) {
 							throw new SocketIOException(e);
 						}
-						if (!isConnectionPersistant) {
+						if (!isConnectionPersistant && !continuation.isInitial()) {
 							Continuation cont = continuation;
 							continuation = null;
 							cont.complete();
@@ -321,10 +321,14 @@ public void connect(HttpServletRequest request,
 			is_open = true;
 			session.onConnect(this);
 			finishSend(response);
-			if (isConnectionPersistant && continuation != null) {
-				request.setAttribute(CONTINUATION_KEY, continuation);
-				continuation.suspend(response);
-			}
+            if (continuation != null) {
+                if (isConnectionPersistant) {
+                    request.setAttribute(CONTINUATION_KEY, continuation);
+                    continuation.suspend(response);
+                } else {
+                    continuation = null;
+                }
+            }
 		}
 
 		@Override
@@ -349,7 +353,7 @@ public void abort() {
 				public boolean onMessages(List<String> messages) {
 					return false;
 				}
-				
+
 				@Override
 				public boolean onMessage(String message) {
 					return false;