dieterjava
diff --git a/‎src/main/java/org/java_websocket/WebSocketImpl.java‎
Lines changed: 10 additions & 1 deletion b/‎src/main/java/org/java_websocket/WebSocketImpl.java‎
Lines changed: 10 additions & 1 deletion
diff --git a/‎src/main/java/org/java_websocket/drafts/Draft_76.java‎
Lines changed: 4 additions & 1 deletion b/‎src/main/java/org/java_websocket/drafts/Draft_76.java‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎src/main/java/org/java_websocket/framing/BinaryFrame.java‎
Lines changed: 8 additions & 4 deletions b/‎src/main/java/org/java_websocket/framing/BinaryFrame.java‎
Lines changed: 8 additions & 4 deletions
@@ -454,7 +454,16 @@ private void close( int code, String message, boolean remote ) {
 								wsl.onWebsocketError( this, e );
 							}
 						}
-						sendFrame( new CloseFrame( code, message ) );
+						CloseFrame closeFrame = new CloseFrame();
+						closeFrame.setReason(message);
+						closeFrame.setCode(code);
+						try {
+							closeFrame.isValid();
+							sendFrame(closeFrame);
+						} catch (InvalidDataException e) {
+							//Rethrow invalid data exception
+							throw e;
+						}
 					} catch ( InvalidDataException e ) {
 						wsl.onWebsocketError( this, e );
 						flushAndClose( CloseFrame.ABNORMAL_CLOSE, "generated frame is invalid", false );
 
@@ -209,7 +209,10 @@ public List<Framedata> translateFrame( ByteBuffer buffer ) throws InvalidDataExc
 			}
 			if( !currentFrame.hasRemaining() ) {
 				if( Arrays.equals( currentFrame.array(), closehandshake ) ) {
-					frames.add( new CloseFrame( CloseFrame.NORMAL ) );
+					CloseFrame closeFrame = new CloseFrame();
+					closeFrame.setCode(CloseFrame.NORMAL);
+					closeFrame.isValid();
+					frames.add(closeFrame);
 					return frames;
 				}
 				else{
 
@@ -1,10 +1,14 @@
 package org.java_websocket.framing;
 
 /**
- * Created by Admin on 23.05.2017.
+ * Class to represent a binary frame
  */
 public class BinaryFrame extends DataFrame {
-	public BinaryFrame() {
-		super( Opcode.BINARY );
-	}
+
+    /**
+     * constructor which sets the opcode of this frame to binary
+     */
+    public BinaryFrame() {
+        super(Opcode.BINARY);
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,10 @@ public List<Framedata> translateFrame( ByteBuffer buffer ) throws InvalidDataExc`
`209`	`209`	`}`
`210`	`210`	`if( !currentFrame.hasRemaining() ) {`
`211`	`211`	`if( Arrays.equals( currentFrame.array(), closehandshake ) ) {`
`212`		`- frames.add( new CloseFrame( CloseFrame.NORMAL ) );`
	`212`	`+ CloseFrame closeFrame = new CloseFrame();`
	`213`	`+ closeFrame.setCode(CloseFrame.NORMAL);`
	`214`	`+ closeFrame.isValid();`
	`215`	`+ frames.add(closeFrame);`
`213`	`216`	`return frames;`
`214`	`217`	`}`
`215`	`218`	`else{`