Added function "reset" to draft , so draft objects can be reused.

Encapsulate WebSocketClient's function releaseAndInitialize.

Author: Davidiusdadi

src/net/tootallnate/websocket/Draft.java

@@ -105,6 +105,8 @@ protected boolean basicAccept( Handshakedata handshakedata ){
 
 	public abstract List<Framedata> createFrames(  String text , boolean mask );
 
+	public abstract void reset( );
+	
 	public List<ByteBuffer> createHandshake( Handshakedata handshakedata , Role ownrole ){
 		return createHandshake( handshakedata , ownrole , true );
 	}

src/net/tootallnate/websocket/WebSocket.java

@@ -308,6 +308,7 @@ public void abort( String problemmessage ) {
    */
   public void close() {
 	//TODO Send HTTP error here in some cases / create abort method
+	draft.reset();
 	currentframe = null;
 	handshakerequest = null;
     try {

src/net/tootallnate/websocket/WebSocketClient.java

@@ -146,7 +146,7 @@ public void send(String text) throws IOException {
    * Reinitializes and prepares the class to be used for reconnect.
    * @return
    */
-  public void releaseAndInitialize()
+  private void releaseAndInitialize()
   {
 	  conn = null;
 	  client = null;
@@ -247,13 +247,17 @@ private void finishConnect() throws IOException, InvalidHandshakeException {
   }
 
   private void sendHandshake() throws IOException, InvalidHandshakeException {
-    String path = uri.getPath();
-    if (path.indexOf("/") != 0) {
-      path = "/" + path;
-    }
+	String path;
+	String part1 = uri.getPath();
+	String part2 = uri.getQuery();
+	if( part1 != null )
+		path = part1;
+	else
+		path = "/";
+     if( part2 != null)
+    	 path += "?" + part2;
     int port = getPort();
     String host = uri.getHost() + (port != WebSocket.DEFAULT_PORT ? ":" + port : "");
-    //String origin = "x"; // TODO: Make 'origin' configurable
 
     HandshakedataImpl1 handshake = new HandshakedataImpl1();
     handshake.setResourceDescriptor ( path );

src/net/tootallnate/websocket/drafts/Draft_10.java

@@ -331,4 +331,9 @@ else if( payloadlength == 126 ){
 
 		return frame;
 	}
+
+	@Override
+	public void reset( ) {
+		incompleteframe = null;
+	}
 }

src/net/tootallnate/websocket/drafts/Draft_75.java

@@ -143,5 +143,11 @@ else if ( newestByte == END_OF_FRAME && readingState ) { // End of Frame
 		}
 		return frames;
 	}
+
+	@Override
+	public void reset( ) {
+		readingState = false;
+		this.currentFrame = null;
+	}
 
 }