fix for TooTallNate#134

Davidiusdadi · Davidiusdadi · commit 9a8fe9aed108 · 2012-12-04T22:58:31.000+01:00
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -44,6 +44,14 @@
  * 
  */
 public class WebSocketImpl extends WebSocket {
+	
+	public static final List<Draft> defaultdraftlist = new ArrayList<Draft>( 4 );
+	static {
+		defaultdraftlist.add( new Draft_17() );
+		defaultdraftlist.add( new Draft_10() );
+		defaultdraftlist.add( new Draft_76() );
+		defaultdraftlist.add( new Draft_75() );
+	}
 
 	public SelectionKey key;
 
@@ -111,12 +119,9 @@ public class WebSocketImpl extends WebSocket {
 	public WebSocketImpl( WebSocketListener listener , List<Draft> drafts , Socket sock ) {
 		this( listener, (Draft) null, sock );
 		this.role = Role.SERVER;
+		// draft.copyInstance will be called when the draft is first needed
 		if( drafts == null || drafts.isEmpty() ) {
-			knownDrafts = new ArrayList<Draft>( 1 );
-			knownDrafts.add( new Draft_17() );
-			knownDrafts.add( new Draft_10() );
-			knownDrafts.add( new Draft_76() );
-			knownDrafts.add( new Draft_75() );
+			knownDrafts = defaultdraftlist;
 		} else {
 			knownDrafts = drafts;
 		}
@@ -130,7 +135,7 @@ public WebSocketImpl( WebSocketListener listener , Draft draft , Socket sock ) {
 		inQueue = new LinkedBlockingQueue<ByteBuffer>();
 		this.wsl = listener;
 		this.role = Role.CLIENT;
-		this.draft = draft;
+		this.draft = draft.copyInstance();
 		this.socket = sock;
 	}
 
@@ -194,6 +199,7 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ) throws IOException
 				if( role == Role.SERVER ) {
 					if( draft == null ) {
 						for( Draft d : knownDrafts ) {
+							d = d.copyInstance();
 							try {
 								d.setParseMode( role );
 								socketBuffer.reset();
diff --git a/src/main/java/org/java_websocket/drafts/Draft.java b/src/main/java/org/java_websocket/drafts/Draft.java
@@ -84,13 +84,13 @@ public static HandshakeBuilder translateHandshakeHttp( ByteBuffer buf, Role role
 		}
 
 		if( role == Role.CLIENT ) {
-		    // translating/parsing the response from the SERVER
+			// translating/parsing the response from the SERVER
 			handshake = new HandshakeImpl1Server();
 			ServerHandshakeBuilder serverhandshake = (ServerHandshakeBuilder) handshake;
 			serverhandshake.setHttpStatus( Short.parseShort( firstLineTokens[ 1 ] ) );
 			serverhandshake.setHttpStatusMessage( firstLineTokens[ 2 ] );
 		} else {
-		    // translating/parsing the request from the CLIENT
+			// translating/parsing the request from the CLIENT
 			ClientHandshakeBuilder clienthandshake = new HandshakeImpl1Client();
 			clienthandshake.setResourceDescriptor( firstLineTokens[ 1 ] );
 			handshake = clienthandshake;
@@ -170,6 +170,12 @@ public List<ByteBuffer> createHandshake( Handshakedata handshakedata, Role ownro
 
 	public abstract CloseHandshakeType getCloseHandshakeType();
 
+	/**
+	 * Drafts must only be by one websocket at all. To prevent drafts to be used more than once the Websocket implementation should call this method in order to create a new usable version of a given draft instance.<br>
+	 * The copy can be safely used in conjunction with a new websocket connection.
+	 * */
+	public abstract Draft copyInstance();
+
 	public Handshakedata translateHandshake( ByteBuffer buf ) throws InvalidHandshakeException {
 		return translateHandshakeHttp( buf, role );
 	}
diff --git a/src/main/java/org/java_websocket/drafts/Draft_10.java b/src/main/java/org/java_websocket/drafts/Draft_10.java
@@ -386,6 +386,11 @@ public void reset() {
 		incompleteframe = null;
 	}
 
+	@Override
+	public Draft copyInstance() {
+		return new Draft_10();
+	}
+
 	@Override
 	public CloseHandshakeType getCloseHandshakeType() {
 		return CloseHandshakeType.TWOWAY;
diff --git a/src/main/java/org/java_websocket/drafts/Draft_17.java b/src/main/java/org/java_websocket/drafts/Draft_17.java
@@ -20,4 +20,9 @@ public ClientHandshakeBuilder postProcessHandshakeRequestAsClient( ClientHandsha
 		return request;
 	}
 
+	@Override
+	public Draft copyInstance() {
+		return new Draft_17();
+	}
+
 }
diff --git a/src/main/java/org/java_websocket/drafts/Draft_75.java b/src/main/java/org/java_websocket/drafts/Draft_75.java
@@ -202,4 +202,9 @@ public ByteBuffer increaseBuffer( ByteBuffer full ) {
 		newbuffer.put( full );
 		return newbuffer;
 	}
+
+	@Override
+	public Draft copyInstance() {
+		return new Draft_75();
+	}
 }
diff --git a/src/main/java/org/java_websocket/drafts/Draft_76.java b/src/main/java/org/java_websocket/drafts/Draft_76.java
@@ -234,4 +234,9 @@ public ByteBuffer createBinaryFrame( Framedata framedata ) {
 	public CloseHandshakeType getCloseHandshakeType() {
 		return CloseHandshakeType.ONEWAY;
 	}
+
+	@Override
+	public Draft copyInstance() {
+		return new Draft_76();
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,9 @@ public ClientHandshakeBuilder postProcessHandshakeRequestAsClient( ClientHandsha`
`20`	`20`	`return request;`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ @Override`
	`24`	`+ public Draft copyInstance() {`
	`25`	`+ return new Draft_17();`
	`26`	`+ }`
	`27`	`+`
`23`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,4 +202,9 @@ public ByteBuffer increaseBuffer( ByteBuffer full ) {`
`202`	`202`	`newbuffer.put( full );`
`203`	`203`	`return newbuffer;`
`204`	`204`	`}`
	`205`	`+`
	`206`	`+ @Override`
	`207`	`+ public Draft copyInstance() {`
	`208`	`+ return new Draft_75();`
	`209`	`+ }`
`205`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -234,4 +234,9 @@ public ByteBuffer createBinaryFrame( Framedata framedata ) {`
`234`	`234`	`public CloseHandshakeType getCloseHandshakeType() {`
`235`	`235`	`return CloseHandshakeType.ONEWAY;`
`236`	`236`	`}`
	`237`	`+`
	`238`	`+ @Override`
	`239`	`+ public Draft copyInstance() {`
	`240`	`+ return new Draft_76();`
	`241`	`+ }`
`237`	`242`	`}`