Skip to content

WebSocketServer code quality #789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marci4 merged 4 commits into from
Oct 23, 2018
Merged

WebSocketServer code quality #789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9ec613
Improve code quality
marci4 Oct 21, 2018
b26515b
Additional tests
marci4 Oct 21, 2018
4b3f9ad
Nest if
marci4 Oct 23, 2018
fc4950f
Merge branch 'master' into WebSocketServerCodeQuality
marci4 Oct 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added keystore.jks
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main/example/simplelogger.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
org.slf4j.simpleLogger.logFile=System.out
org.slf4j.simpleLogger.defaultLogLevel=trace
org.slf4j.simpleLogger.defaultLogLevel=error
org.slf4j.simpleLogger.showDateTime=true
org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss.SSS
org.slf4j.simpleLogger.showThreadName=false
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/org/java_websocket/SSLSocketChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public synchronized int read( ByteBuffer dst ) throws IOException {
return ByteBufferUtils.transferByteBuffer( peerAppData, dst );
case BUFFER_OVERFLOW:
peerAppData = enlargeApplicationBuffer( peerAppData );
break;
return read(dst);
case CLOSED:
closeConnection();
dst.clear();
Expand Down Expand Up @@ -323,8 +323,6 @@ private boolean doHandshake() throws IOException {
}
break;
case NEED_WRAP:


myNetData.clear();
try {
result = engine.wrap( myAppData, myNetData );
Expand Down
Loading