Usage of ByteBufferUtils

marci4 · marci4 · commit b790f771a0a7 · 2017-05-23T14:47:13.000+02:00
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -35,14 +35,12 @@
  * text frames, and receiving frames through an event-based model.
  */
 public class WebSocketImpl implements WebSocket {
-
-	public static final List<Draft> defaultdraftlist = new ArrayList<Draft>( 1 );
 	public static int RCVBUF = 16384;
-	public static/*final*/ boolean DEBUG = false; // must be final in the future in order to take advantage of VM optimization
 
-	static {
-		defaultdraftlist.add( new Draft_6455() );
-	}
+    /**
+     * Activate debug mode for additional infos
+     */
+	public static boolean DEBUG = false; // must be final in the future in order to take advantage of VM optimization
 
 	/**
 	 * Queue of buffers that need to be sent to the client.
@@ -70,12 +68,25 @@ public class WebSocketImpl implements WebSocket {
 	 */
 	private volatile boolean flushandclosestate = false;
 	private READYSTATE readystate = READYSTATE.NOT_YET_CONNECTED;
+
+    /**
+     * A list of drafts available for this websocket
+     */
 	private List<Draft> knownDrafts;
 
+    /**
+     * The draft which is used by this websocket
+     */
 	private Draft draft = null;
 
+    /**
+     * The role which this websocket takes in the connection
+     */
 	private Role role;
 
+    /**
+     * The frame which had the opcode Continous set
+     */
 	private Framedata current_continuous_frame = null;
 
 	/**
@@ -110,7 +121,8 @@ public WebSocketImpl( WebSocketListener listener, List<Draft> drafts ) {
 		this.role = Role.SERVER;
 		// draft.copyInstance will be called when the draft is first needed
 		if( drafts == null || drafts.isEmpty() ) {
-			knownDrafts = defaultdraftlist;
+			knownDrafts = new ArrayList<Draft>();
+			knownDrafts.add(new Draft_6455());
 		} else {
 			knownDrafts = drafts;
 		}
diff --git a/src/main/java/org/java_websocket/framing/CloseFrameBuilder.java b/src/main/java/org/java_websocket/framing/CloseFrameBuilder.java
@@ -2,15 +2,12 @@
 
 import org.java_websocket.exceptions.InvalidDataException;
 import org.java_websocket.exceptions.InvalidFrameException;
+import org.java_websocket.util.ByteBufferUtils;
 import org.java_websocket.util.Charsetfunctions;
 
 import java.nio.ByteBuffer;
 
 public class CloseFrameBuilder extends FramedataImpl1 implements CloseFrame {
-	/**
-	 * Attribute for just an empty ByteBuffer
-	 */
-	static final ByteBuffer emptybytebuffer = ByteBuffer.allocate( 0 );
 
 	/**
 	 * The close code used in this close frame
@@ -150,7 +147,7 @@ public void setPayload( ByteBuffer payload ) throws InvalidDataException {
 	@Override
 	public ByteBuffer getPayloadData() {
 		if( code == NOCODE )
-			return emptybytebuffer;
+			return ByteBufferUtils.getEmptyByteBuffer();
 		return super.getPayloadData();
 	}
 
diff --git a/src/main/java/org/java_websocket/framing/FramedataImpl1.java b/src/main/java/org/java_websocket/framing/FramedataImpl1.java
@@ -4,14 +4,10 @@
 import java.util.Arrays;
 
 import org.java_websocket.exceptions.InvalidDataException;
-import org.java_websocket.exceptions.InvalidFrameException;
+import org.java_websocket.util.ByteBufferUtils;
 import org.java_websocket.util.Charsetfunctions;
 
 public class FramedataImpl1 implements FrameBuilder {
-	/**
-	 * Attribute for just an empty array
-	 */
-	private static byte[] emptyarray = {};
 
 	/**
 	 * Indicates that this is the final fragment in a message.
@@ -44,7 +40,7 @@ public FramedataImpl1() {
 	 */
 	public FramedataImpl1( Opcode op ) {
 		this.optcode = op;
-		unmaskedpayload = ByteBuffer.wrap( emptyarray );
+		unmaskedpayload = ByteBufferUtils.getEmptyByteBuffer();
 	}
 
 	/**
