merged TooTallNate/trunk with Davidiusdadi/trunk

Davidiusdadi · Davidiusdadi · commit 8fc4922e4b2d · 2012-04-02T02:05:48.000+02:00
diff --git a/README.markdown b/README.markdown
@@ -73,7 +73,7 @@ Minimum Required JDK
 
 `Java-WebSocket` is known to work with:
 
- * Java 1.4 (aka SE 6)
+ * Java 1.5 (aka SE 6)
 * Android 1.6 (API 4)
 
 Other JRE implementations may work as well, but haven't been tested.
diff --git a/src/org/java_websocket/WebSocket.java b/src/org/java_websocket/WebSocket.java
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicLong;
 
 import org.java_websocket.drafts.Draft;
 import org.java_websocket.drafts.Draft.CloseHandshakeType;
@@ -90,12 +91,13 @@ public enum Role{
 	 * Queue of buffers that need to be sent to the client.
 	 */
 	private BlockingQueue<ByteBuffer> bufferQueue;
+	
 	/**
 	 * The amount of bytes still in queue to be sent, at every given time.
 	 * It's updated at every send/sent operation.
 	 */
-	private Long bufferQueueTotalAmount = (long) 0;
-
+	private AtomicLong bufferQueueTotalAmount = new AtomicLong(0l);
+	
 	private Draft draft = null;
 
 	private Role role;
@@ -499,7 +501,7 @@ boolean hasBufferedData(){
 	 * @return Amount of Data still in Queue and not sent yet of the socket
 	 */
 	long bufferedDataAmount(){
-		return bufferQueueTotalAmount;
+		return bufferQueueTotalAmount.get();
 	}
 
 	/**
@@ -512,10 +514,9 @@ public void flush() throws IOException{
 			if( buffer.remaining() > 0 ){
 				continue;
 			} else{
-				synchronized ( bufferQueueTotalAmount ){
-					// subtract this amount of data from the total queued (synchronized over this object)
-					bufferQueueTotalAmount -= written;
-				}
+				// subtract this amount of data from the total queued (synchronized over this object)
+				bufferQueueTotalAmount.addAndGet( -written );
+		
 				this.bufferQueue.poll(); // Buffer finished. Remove it.
 				buffer = this.bufferQueue.peek();
 			}
@@ -562,10 +563,10 @@ public void startHandshake( ClientHandshakeBuilder handshakedata ) throws Invali
 	private void channelWrite( ByteBuffer buf ) throws InterruptedException{
 		if( DEBUG )
 			System.out.println( "write(" + buf.remaining() + "):{" + ( buf.remaining() > 1000 ? "too big to display" : new String( buf.array() ) ) + "}" );
-		synchronized ( bufferQueueTotalAmount ){
-			// add up the number of bytes to the total queued (synchronized over this object)
-			bufferQueueTotalAmount += buf.remaining();
-		}
+
+		// add up the number of bytes to the total queued (synchronized over this object)
+		bufferQueueTotalAmount.addAndGet(buf.remaining());
+		
 		if( !bufferQueue.offer( buf ) ){
 			try{
 				flush();
diff --git a/src/org/java_websocket/WebSocketClient.java b/src/org/java_websocket/WebSocketClient.java
@@ -108,9 +108,12 @@ public void close(){
 		if( thread != null ){
 			thread.interrupt();
 			closelock.lock();
-			if( selector != null )
-				selector.wakeup();
-			closelock.unlock();
+			try{
+				if( selector != null )
+					selector.wakeup();
+			} finally{
+				closelock.unlock();
+			}
 		}
 
 	}
diff --git a/src/org/java_websocket/drafts/Draft_10.java b/src/org/java_websocket/drafts/Draft_10.java
@@ -31,6 +31,13 @@
 public class Draft_10 extends Draft{
 
 	private class IncompleteException extends Throwable{
+		
+		/**
+		 * It's Serializable.
+		 */
+		private static final long serialVersionUID = 7330519489840500997L;
+		
+		
 		private int preferedsize;
 		public IncompleteException( int preferedsize ){
 			this.preferedsize = preferedsize;
@@ -56,6 +63,8 @@ public static int readVersion( Handshakedata handshakedata ){
 
 	private ByteBuffer incompleteframe;
 	private Framedata fragmentedframe = null;
+	
+	private final Random reuseableRandom = new Random();
 
 	@Override
 	public HandshakeState acceptHandshakeAsClient( ClientHandshake request, ServerHandshake response ) throws InvalidHandshakeException{
@@ -106,7 +115,7 @@ public ByteBuffer createBinaryFrame( Framedata framedata ){
 
 		if( mask ){
 			ByteBuffer maskkey = ByteBuffer.allocate( 4 );
-			maskkey.putInt( new Random().nextInt() );
+			maskkey.putInt( reuseableRandom.nextInt() );
 			buf.put( maskkey.array() );
 			for( int i = 0 ; i < mes.limit() ; i++ ){
 				buf.put( (byte) ( mes.get() ^ maskkey.get( i % 4 ) ) );
@@ -183,7 +192,7 @@ public ClientHandshakeBuilder postProcessHandshakeRequestAsClient( ClientHandsha
 		request.put( "Sec-WebSocket-Version", "8" );
 
 		byte[] random = new byte[ 16 ];
-		new Random().nextBytes( random );
+		reuseableRandom.nextBytes( random );
 		request.put( "Sec-WebSocket-Key", Base64.encodeBytes( random ) );
 
 		return request;
diff --git a/src/org/java_websocket/drafts/Draft_75.java b/src/org/java_websocket/drafts/Draft_75.java
@@ -44,6 +44,10 @@ public class Draft_75 extends Draft{
 	private boolean inframe = false;
 	protected List<Framedata> readyframes = new LinkedList<Framedata>();
 	protected ByteBuffer currentFrame;
+	
+	
+	private final Random reuseableRandom = new Random();
+	
 
 	@Override
 	public HandshakeState acceptHandshakeAsClient( ClientHandshake request, ServerHandshake response ){
@@ -99,7 +103,7 @@ public ClientHandshakeBuilder postProcessHandshakeRequestAsClient( ClientHandsha
 		request.put( "Upgrade", "WebSocket" );
 		request.put( "Connection", "Upgrade" );
 		if( !request.hasFieldValue( "Origin" ) ){
-			request.put( "Origin", "random" + new Random().nextInt() );
+			request.put( "Origin", "random" + reuseableRandom.nextInt() );
 		}
 
 		return request;
diff --git a/src/org/java_websocket/drafts/Draft_76.java b/src/org/java_websocket/drafts/Draft_76.java
@@ -28,6 +28,9 @@
 public class Draft_76 extends Draft_75{
 	private boolean failed = false;
 	private static final byte[] closehandshake ={-1, 0 };
+	
+	private final Random reuseableRandom = new Random();
+	
 
 	public static byte[] createChallenge( String key1, String key2, byte[] key3 ) throws InvalidHandshakeException{
 		byte[] part1 = getPart( key1 );
@@ -137,15 +140,15 @@ public HandshakeState acceptHandshakeAsServer( ClientHandshake handshakedata ){
 	public ClientHandshakeBuilder postProcessHandshakeRequestAsClient( ClientHandshakeBuilder request ){
 		request.put( "Upgrade", "WebSocket" );
 		request.put( "Connection", "Upgrade" );
-		request.put( "Sec-WebSocket-Key1", this.generateKey() );
-		request.put( "Sec-WebSocket-Key2", this.generateKey() );
+		request.put( "Sec-WebSocket-Key1", generateKey() );
+		request.put( "Sec-WebSocket-Key2", generateKey() );
 
 		if( !request.hasFieldValue( "Origin" ) ){
-			request.put( "Origin", "random" + new Random().nextInt() );
+			request.put( "Origin", "random" + reuseableRandom.nextInt() );
 		}
 
 		byte[] key3 = new byte[ 8 ];
-		new Random().nextBytes( key3 );
+		reuseableRandom.nextBytes( key3 );
 		request.setContent( key3 );
 		return request;
 
diff --git a/src/org/java_websocket/exeptions/IncompleteHandshakeException.java b/src/org/java_websocket/exeptions/IncompleteHandshakeException.java
@@ -2,6 +2,11 @@
 
 public class IncompleteHandshakeException extends RuntimeException{
 
+	/**
+	 * Serializable
+	 */
+	private static final long serialVersionUID = 7906596804233893092L;
+
 	public IncompleteHandshakeException(){
 		super();
 	}
diff --git a/src/org/java_websocket/exeptions/InvalidDataException.java b/src/org/java_websocket/exeptions/InvalidDataException.java
@@ -1,7 +1,13 @@
 package org.java_websocket.exeptions;
 
 public class InvalidDataException extends Exception{
+	/**
+	 * Serializable
+	 */
+	private static final long serialVersionUID = 3731842424390998726L;
+	
 	private int closecode;
+	
 	public InvalidDataException( int closecode ){
 		this.closecode = closecode;
 	}
@@ -14,14 +20,14 @@ public InvalidDataException( int closecode , String s ){
 	public InvalidDataException( int closecode , Throwable t ){
 		super( t );
 		if( t instanceof InvalidDataException ){
-			closecode = ( (InvalidDataException) t ).getCloseCode();
+			this.closecode = ( (InvalidDataException) t ).getCloseCode();
 		}
 	}
 
 	public InvalidDataException( int closecode , String s , Throwable t ){
 		super( s, t );
 		if( t instanceof InvalidDataException ){
-			closecode = ( (InvalidDataException) t ).getCloseCode();
+			this.closecode = ( (InvalidDataException) t ).getCloseCode();
 		}
 	}
 
diff --git a/src/org/java_websocket/exeptions/InvalidFrameException.java b/src/org/java_websocket/exeptions/InvalidFrameException.java
@@ -4,6 +4,11 @@
 
 public class InvalidFrameException extends InvalidDataException{
 
+	/**
+	 * Serializable
+	 */
+	private static final long serialVersionUID = -9016496369828887591L;
+
 	public InvalidFrameException(){
 		super( CloseFrame.PROTOCOL_ERROR );
 	}
diff --git a/src/org/java_websocket/exeptions/InvalidHandshakeException.java b/src/org/java_websocket/exeptions/InvalidHandshakeException.java
@@ -4,6 +4,11 @@
 
 public class InvalidHandshakeException extends InvalidDataException{
 
+	/**
+	 * Serializable
+	 */
+	private static final long serialVersionUID = -1426533877490484964L;
+
 	public InvalidHandshakeException(){
 		super( CloseFrame.PROTOCOL_ERROR );
 	}
diff --git a/src/org/java_websocket/exeptions/LimitExedeedException.java b/src/org/java_websocket/exeptions/LimitExedeedException.java
@@ -4,6 +4,11 @@
 
 public class LimitExedeedException extends InvalidDataException{
 
+	/**
+	 * Serializable
+	 */
+	private static final long serialVersionUID = 6908339749836826785L;
+
 	public LimitExedeedException(){
 		super( CloseFrame.TOOBIG );
 	}
diff --git a/src/org/java_websocket/exeptions/NotSendableException.java b/src/org/java_websocket/exeptions/NotSendableException.java
@@ -2,6 +2,11 @@
 
 public class NotSendableException extends RuntimeException{
 
+	/**
+	 * Serializable
+	 */
+	private static final long serialVersionUID = -6468967874576651628L;
+
 	public NotSendableException(){
 	}
 
diff --git a/src/org/java_websocket/framing/FramedataImpl1.java b/src/org/java_websocket/framing/FramedataImpl1.java
@@ -1,6 +1,7 @@
 package org.java_websocket.framing;
 
 import java.nio.ByteBuffer;
+import java.util.Arrays;
 
 import org.java_websocket.exeptions.InvalidDataException;
 import org.java_websocket.exeptions.InvalidFrameException;
@@ -102,7 +103,7 @@ public void append( Framedata nextframe ) throws InvalidFrameException{
 
 	@Override
 	public String toString(){
-		return "Framedata{optcode:" + getOpcode() + ", fin:" + isFin() + ", payloadlength:" + unmaskedpayload.limit() + ", payload:" + Charsetfunctions.utf8Bytes( new String( unmaskedpayload.array() ) ) + "}";
+		return "Framedata{optcode:" + getOpcode() + ", fin:" + isFin() + ", payloadlength:" + unmaskedpayload.limit() + ", payload:" + Arrays.toString(Charsetfunctions.utf8Bytes( new String( unmaskedpayload.array() ) ) ) + "}";
 	}
 
 }
diff --git a/src/org/java_websocket/util/Base64.java b/src/org/java_websocket/util/Base64.java
@@ -1359,7 +1359,7 @@ public static Object decodeToObject(
 @Override
 public Class<?> resolveClass(java.io.ObjectStreamClass streamClass)
 throws java.io.IOException, ClassNotFoundException{
- Class c = Class.forName(streamClass.getName(), false, loader);
+ Class<?> c = Class.forName(streamClass.getName(), false, loader);
 if( c == null ){
 return super.resolveClass(streamClass);
 } else{

-Original file line number
+Diff line change
 publicclassDraft_10extendsDraft{
 privateclassIncompleteExceptionextendsThrowable{
++
 +/**
 + * It's Serializable.
 + */
 +privatestaticfinallongserialVersionUID = 7330519489840500997L;
++
++
 privateintpreferedsize;
 publicIncompleteException( intpreferedsize ){
 this.preferedsize = preferedsize;
 privateByteBufferincompleteframe;
 privateFramedatafragmentedframe = null;
++
 +privatefinalRandomreuseableRandom = newRandom();
 @Override
 publicHandshakeStateacceptHandshakeAsClient( ClientHandshakerequest, ServerHandshakeresponse ) throwsInvalidHandshakeException{
 if( mask ){
 ByteBuffermaskkey = ByteBuffer.allocate( 4 );
 -maskkey.putInt( newRandom().nextInt() );
 +maskkey.putInt( reuseableRandom.nextInt() );
 buf.put( maskkey.array() );
 for( inti = 0 ; i < mes.limit() ; i++ ){
 buf.put( (byte) ( mes.get() ^ maskkey.get( i % 4 ) ) );
 request.put( "Sec-WebSocket-Version", "8" );
 byte[] random = newbyte[ 16 ];
 -newRandom().nextBytes( random );
 +reuseableRandom.nextBytes( random );
 request.put( "Sec-WebSocket-Key", Base64.encodeBytes( random ) );
 returnrequest;
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,13 @@`
`1`	`1`	`packageorg.java_websocket.exeptions;`
`2`	`2`
`3`	`3`	`publicclassInvalidDataExceptionextendsException{`
	`4`	`+/**`
	`5`	`+ * Serializable`
	`6`	`+ */`
	`7`	`+privatestaticfinallongserialVersionUID = 3731842424390998726L;`
	`8`	`+`
`4`	`9`	`privateintclosecode;`
	`10`	`+`
`5`	`11`	`publicInvalidDataException( intclosecode ){`
`6`	`12`	`this.closecode = closecode;`
`7`	`13`	`}`
`@@ -14,14 +20,14 @@ public InvalidDataException( int closecode , String s ){`
`14`	`20`	`publicInvalidDataException( intclosecode , Throwablet ){`
`15`	`21`	`super( t );`
`16`	`22`	`if( tinstanceofInvalidDataException ){`
`17`		`-closecode = ( (InvalidDataException) t ).getCloseCode();`
	`23`	`+this.closecode = ( (InvalidDataException) t ).getCloseCode();`
`18`	`24`	`}`
`19`	`25`	`}`
`20`	`26`
`21`	`27`	`publicInvalidDataException( intclosecode , Strings , Throwablet ){`
`22`	`28`	`super( s, t );`
`23`	`29`	`if( tinstanceofInvalidDataException ){`
`24`		`-closecode = ( (InvalidDataException) t ).getCloseCode();`
	`30`	`+this.closecode = ( (InvalidDataException) t ).getCloseCode();`
`25`	`31`	`}`
`26`	`32`	`}`
`27`	`33`