oloed
diff --git a/‎example/ChatServer.java‎
Lines changed: 7 additions & 16 deletions b/‎example/ChatServer.java‎
Lines changed: 7 additions & 16 deletions
diff --git a/‎src/org/java_websocket/WebSocket.java‎
Lines changed: 1 addition & 6 deletions b/‎src/org/java_websocket/WebSocket.java‎
Lines changed: 1 addition & 6 deletions
diff --git a/‎src/org/java_websocket/WebSocketClient.java‎
Lines changed: 3 additions & 3 deletions b/‎src/org/java_websocket/WebSocketClient.java‎
Lines changed: 3 additions & 3 deletions
@@ -24,32 +24,23 @@ public ChatServer( InetSocketAddress address ) {
 
 	@Override
 	public void onOpen( WebSocket conn, ClientHandshake handshake ) {
-		try {
-			this.sendToAll( "new connection" );
-		} catch ( InterruptedException ex ) {
-			ex.printStackTrace();
-		}
+		this.sendToAll( "new connection" );
 		System.out.println( conn + " entered the room!" );
 	}
 
 	@Override
 	public void onClose( WebSocket conn, int code, String reason, boolean remote ) {
-		try {
-			this.sendToAll( conn + " has left the room!" );
-		} catch ( InterruptedException ex ) {
-			ex.printStackTrace();
-		}
+		this.sendToAll( conn + " has left the room!" );
 		System.out.println( conn + " has left the room!" );
 	}
 
 	@Override
 	public void onMessage( WebSocket conn, String message ) {
-		try {
+		this.sendToAll( message );
+
 			this.sendToAll( message );
-		} catch ( InterruptedException ex ) {
-			ex.printStackTrace();
-		}
-		System.out.println( conn + ": " + message );
+
+		// System.out.println( conn + ": " + message );
 	}
 
 	public static void main( String[] args ) throws InterruptedException , IOException {
@@ -83,7 +74,7 @@ public void onError( WebSocket conn, Exception ex ) {
 	 * @throws InterruptedException
 	 *             When socket related I/O errors occur.
 	 */
-	public void sendToAll( String text ) throws InterruptedException {
+	public void sendToAll( String text ) {
 		Set<WebSocket> con = connections();
 		synchronized ( con ) {
 			for( WebSocket c : con ) {
 
@@ -16,7 +16,7 @@ public enum Role {
 		CLIENT, SERVER
 	}
 
-	public static int RCVBUF = 512;
+	public static int RCVBUF = 64;
 
 	public static/*final*/boolean DEBUG = false; // must be final in the future in order to take advantage of VM optimization
 
@@ -89,11 +89,6 @@ public enum Role {
 	 */
 	public abstract long bufferedDataAmount();
 
-	/**
-	 * Empty the internal buffer, sending all the pending data before continuing.
-	 */
-	public abstract void flush() throws IOException;
-
 	/** Returns whether the batch process all available data */
 	public abstract boolean batch() throws IOException;
 
 
@@ -196,6 +196,7 @@ protected final void interruptableRun() {
 			return;
 		}
 		conn = (WebSocketImpl) wf.createWebSocket( this, draft, client );
+		ByteBuffer buff = ByteBuffer.allocate( WebSocket.RCVBUF );
 		try/*IO*/{
 			while ( !conn.isClosed() ) {
 				if( Thread.interrupted() ) {
@@ -209,9 +210,8 @@ protected final void interruptableRun() {
 				while ( i.hasNext() ) {
 					key = i.next();
 					i.remove();
-					if( key.isReadable() ) {
-						conn.read();
-						conn.decode();
+					if( key.isReadable() && conn.read( buff ) ) {
+						conn.decode( buff );
 					}
 					if( !key.isValid() ) {
 						continue;