Skip to content

Commit 7bc8fa1

Browse files
committed
Check for sending a close frame
TooTallNate#579
1 parent caed0d5 commit 7bc8fa1

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<name>Java-WebSocket</name>
88
<description>A barebones WebSocket client and server implementation written 100% in Java</description>
99
<url>https://github.com/TooTallNate/Java-WebSocket</url>
10+
<properties>
11+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12+
</properties>
1013
<licenses>
1114
<license>
1215
<name>MIT License</name>

src/main/java/org/java_websocket/WebSocketImpl.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -424,11 +424,13 @@ public void close( int code, String message, boolean remote ) {
424424
wsl.onWebsocketError( this, e );
425425
}
426426
}
427-
CloseFrame closeFrame = new CloseFrame();
428-
closeFrame.setReason( message );
429-
closeFrame.setCode( code );
430-
closeFrame.isValid();
431-
sendFrame( closeFrame );
427+
if (isOpen()) {
428+
CloseFrame closeFrame = new CloseFrame();
429+
closeFrame.setReason( message );
430+
closeFrame.setCode( code );
431+
closeFrame.isValid();
432+
sendFrame( closeFrame );
433+
}
432434
} catch ( InvalidDataException e ) {
433435
wsl.onWebsocketError( this, e );
434436
flushAndClose( CloseFrame.ABNORMAL_CLOSE, "generated frame is invalid", false );

0 commit comments

Comments
 (0)