fix for TooTallNate#90

Davidiusdadi · Davidiusdadi · commit e9424f15254a · 2012-05-16T23:18:38.000+02:00
minor improvements
diff --git a/example/ChatServer.java b/example/ChatServer.java
@@ -1,7 +1,6 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.util.Set;
@@ -16,7 +15,7 @@
 public class ChatServer extends WebSocketServer {
 
 	public ChatServer( int port ) throws UnknownHostException {
-		super( new InetSocketAddress( InetAddress.getByName( "localhost" ), port ) );
+		super( new InetSocketAddress( port ) );
 	}
 
 	public ChatServer( InetSocketAddress address ) {
@@ -55,7 +54,7 @@ public void onMessage( WebSocket conn, String message ) {
 
 	public static void main( String[] args ) throws InterruptedException , IOException {
 		WebSocket.DEBUG = true;
-		int port = 8887;
+		int port = 8887; // 843 flash policy port
 		try {
 			port = Integer.parseInt( args[ 0 ] );
 		} catch ( Exception ex ) {
diff --git a/src/org/java_websocket/WebSocket.java b/src/org/java_websocket/WebSocket.java
@@ -16,7 +16,7 @@ public enum Role {
 		CLIENT, SERVER
 	}
 
-	public static int BUFFERSIZE = 512;
+	public static int RCVBUF = 512;
 
 	public static/*final*/boolean DEBUG = false; // must be final in the future in order to take advantage of VM optimization
 
diff --git a/src/org/java_websocket/WebSocketClient.java b/src/org/java_websocket/WebSocketClient.java
@@ -11,6 +11,7 @@
 import java.nio.channels.SocketChannel;
 import java.nio.channels.UnresolvedAddressException;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.locks.Lock;
@@ -61,6 +62,18 @@ public abstract class WebSocketClient extends WebSocketAdapter implements Runnab
 
 	private Map<String, String> headers;
 
+	WebSocketFactory wf = new WebSocketFactory() {
+		@Override
+		public WebSocket createWebSocket( WebSocketAdapter a, Draft d, SocketChannel c ) {
+			return new WebSocketImpl( WebSocketClient.this, d, c );
+		}
+
+		@Override
+		public WebSocket createWebSocket( WebSocketAdapter a, List<Draft> d, SocketChannel c ) {
+			return new WebSocketImpl( WebSocketClient.this, d, c );
+		}
+	};
+
 	public WebSocketClient( URI serverURI ) {
 		this( serverURI, new Draft_10() );
 	}
@@ -182,7 +195,7 @@ protected final void interruptableRun() {
 			onWebsocketError( conn, e );
 			return;
 		}
-		conn = new WebSocketImpl( this, draft, client );
+		conn = (WebSocketImpl) wf.createWebSocket( this, draft, client );
 		try/*IO*/{
 			while ( !conn.isClosed() ) {
 				if( Thread.interrupted() ) {
@@ -197,7 +210,8 @@ protected final void interruptableRun() {
 					key = i.next();
 					i.remove();
 					if( key.isReadable() ) {
-						conn.handleRead();
+						conn.read();
+						conn.decode();
 					}
 					if( !key.isValid() ) {
 						continue;
@@ -375,6 +389,14 @@ public WebSocket getConnection() {
 		return conn;
 	}
 
+	public final void setWebSocketFactory( WebSocketFactory wsf ) {
+		this.wf = wsf;
+	}
+
+	public final WebSocketFactory getWebSocketFactory() {
+		return wf;
+	}
+
 	// ABTRACT METHODS /////////////////////////////////////////////////////////
 	public abstract void onOpen( ServerHandshake handshakedata );
 	public abstract void onMessage( String message );
diff --git a/src/org/java_websocket/WebSocketFactory.java b/src/org/java_websocket/WebSocketFactory.java
@@ -7,5 +7,5 @@
 
 public interface WebSocketFactory {
 	public WebSocket createWebSocket( WebSocketAdapter a, Draft d, SocketChannel c );
-	public WebSocket createWebSocket( WebSocketServer a, List<Draft> drafts, SocketChannel c );
+	public WebSocket createWebSocket( WebSocketAdapter a, List<Draft> drafts, SocketChannel c );
 }
diff --git a/src/org/java_websocket/WebSocketImpl.java b/src/org/java_websocket/WebSocketImpl.java
diff --git a/src/org/java_websocket/WebSocketServer.java b/src/org/java_websocket/WebSocketServer.java

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public enum Role {`
`16`	`16`	`CLIENT, SERVER`
`17`	`17`	`}`
`18`	`18`
`19`		`- public static int BUFFERSIZE = 512;`
	`19`	`+ public static int RCVBUF = 512;`
`20`	`20`
`21`	`21`	`public static/final/boolean DEBUG = false; // must be final in the future in order to take advantage of VM optimization`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@`
`7`	`7`
`8`	`8`	`public interface WebSocketFactory {`
`9`	`9`	`public WebSocket createWebSocket( WebSocketAdapter a, Draft d, SocketChannel c );`
`10`		`- public WebSocket createWebSocket( WebSocketServer a, List<Draft> drafts, SocketChannel c );`
	`10`	`+ public WebSocket createWebSocket( WebSocketAdapter a, List<Draft> drafts, SocketChannel c );`
`11`	`11`	`}`