fixed handling of the shutdown of the underlaying socket connection

Davidiusdadi · Davidiusdadi · commit 575b29eeadf1 · 2012-03-16T01:42:59.000+01:00
some of the the changes belong to the previous commit...xd
diff --git a/src/org/java_websocket/WebSocket.java b/src/org/java_websocket/WebSocket.java
@@ -12,6 +12,7 @@
 import java.util.concurrent.LinkedBlockingQueue;
 
 import org.java_websocket.drafts.Draft;
+import org.java_websocket.drafts.Draft.CloseHandshakeType;
 import org.java_websocket.drafts.Draft.HandshakeState;
 import org.java_websocket.drafts.Draft_10;
 import org.java_websocket.drafts.Draft_17;
@@ -139,7 +140,7 @@ public WebSocket( WebSocketListener listener , List<Draft> drafts , SocketChanne
 
 	private void init( WebSocketListener listener, Draft draft, SocketChannel socketchannel ) {
 		this.sockchannel = socketchannel;
-		this.bufferQueue = new LinkedBlockingQueue<ByteBuffer>( 10 );
+		this.bufferQueue = new LinkedBlockingQueue<ByteBuffer>( 3 );
 		this.socketBuffer = ByteBuffer.allocate( 65558 );
 		socketBuffer.flip();
 		this.wsl = listener;
@@ -160,7 +161,19 @@ private void init( WebSocketListener listener, Draft draft, SocketChannel socket
 			socketBuffer.rewind();
 			socketBuffer.limit( socketBuffer.capacity() );
 			if( sockchannel.read( socketBuffer ) == -1 ) {
-				close( CloseFrame.ABNROMAL_CLOSE );
+				if( draft == null ) {
+					closeConnection( CloseFrame.ABNROMAL_CLOSE, true );
+				} else if( draft.getCloseHandshakeType() == CloseHandshakeType.NONE ) {
+					closeConnection( CloseFrame.NORMAL, true );
+				} else if( draft.getCloseHandshakeType() == CloseHandshakeType.ONEWAY ) {
+					if( role == Role.SERVER )
+						closeConnection( CloseFrame.ABNROMAL_CLOSE, true );
+					else
+						closeConnection( CloseFrame.NORMAL, true );
+				} else {
+					closeConnection( CloseFrame.ABNROMAL_CLOSE, true );
+				}
+
 			}
 
 			socketBuffer.flip();
@@ -298,7 +311,8 @@ private void init( WebSocketListener listener, Draft draft, SocketChannel socket
 								closeConnection( code, reason, true );
 							} else {
 								// echo close handshake
-								close( code, reason );
+								if( draft.getCloseHandshakeType() == CloseHandshakeType.TWOWAY )
+									close( code, reason );
 								closeConnection( code, reason, false );
 							}
 							continue;
@@ -363,7 +377,7 @@ public void closeDirect( int code, String message ) throws IOException {
 					return;
 				}
 				flush();
-				if( draft.hasCloseHandshake() ) {
+				if( draft.getCloseHandshakeType() != CloseHandshakeType.NONE ) {
 					try {
 						sendFrameDirect( new CloseFrameBuilder( code, message ) );
 					} catch ( InvalidDataException e ) {
@@ -477,7 +491,7 @@ boolean hasBufferedData() {
 
 	/**
 	 * The amount of data in Queue, ready to be sent.
-	 *
+	 * 
 	 * @return Amount of Data still in Queue and not sent yet of the socket
 	 */
 	long bufferedDataAmount() {
@@ -494,7 +508,7 @@ public void flush() throws IOException {
 			if( buffer.remaining() > 0 ) {
 				continue;
 			} else {
-				synchronized (bufferQueueTotalAmount) {
+				synchronized ( bufferQueueTotalAmount ) {
 					// subtract this amount of data from the total queued (synchronized over this object)
 					bufferQueueTotalAmount -= buffer.limit();
 				}
@@ -545,7 +559,7 @@ private void channelWrite( ByteBuffer buf ) throws InterruptedException {
 		if( DEBUG )
 			System.out.println( "write(" + buf.limit() + "): {" + ( buf.limit() > 1000 ? "too big to display" : new String( buf.array() ) ) + "}" );
 		buf.rewind(); // TODO rewinding should not be nessesary
-		synchronized (bufferQueueTotalAmount) {
+		synchronized ( bufferQueueTotalAmount ) {
 			// add up the number of bytes to the total queued (synchronized over this object)
 			bufferQueueTotalAmount += buf.limit();
 		}
