Skip to content

Commit

Permalink
Fix connecting hang from replaying a second time
Browse files Browse the repository at this point in the history
Revises the following:
TooTallNate/Java-WebSocket#341
TooTallNate/Java-WebSocket#373
blackrock/Java-WebSocket@a7fb7f5
  • Loading branch information
pau101 committed May 31, 2016
1 parent 6348c1d commit e8c8fdc
Show file tree
Hide file tree
Showing 43 changed files with 7,970 additions and 1 deletion.
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ configurations {

dependencies {
compile "org.slick2d:slick2d-core:1.0.1"
compile "org.java-websocket:Java-WebSocket:1.3.0"
compile "org.lwjgl.lwjgl:lwjgl:2.9.3"
compile "commons-io:commons-io:2.4"
compile "com.google.code.gson:gson:1.7.2"
Expand Down
100 changes: 100 additions & 0 deletions src/main/java/org/java_websocket/AbstractWrappedByteChannel.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/*
* Copyright (c) 2010-2012 Nathan Rajlich
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/

package org.java_websocket;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.ByteChannel;
import java.nio.channels.SocketChannel;

import javax.net.ssl.SSLException;


public class AbstractWrappedByteChannel implements WrappedByteChannel {

private final ByteChannel channel;

public AbstractWrappedByteChannel( ByteChannel towrap ) {
this.channel = towrap;
}

public AbstractWrappedByteChannel( WrappedByteChannel towrap ) {
this.channel = towrap;
}

@Override
public int read( ByteBuffer dst ) throws IOException {
return channel.read( dst );
}

@Override
public boolean isOpen() {
return channel.isOpen();
}

@Override
public void close() throws IOException {
channel.close();
}

@Override
public int write( ByteBuffer src ) throws IOException {
return channel.write( src );
}

@Override
public boolean isNeedWrite() {
return channel instanceof WrappedByteChannel ? ( (WrappedByteChannel) channel ).isNeedWrite() : false;
}

@Override
public void writeMore() throws IOException {
if( channel instanceof WrappedByteChannel )
( (WrappedByteChannel) channel ).writeMore();

}

@Override
public boolean isNeedRead() {
return channel instanceof WrappedByteChannel ? ( (WrappedByteChannel) channel ).isNeedRead() : false;

}

@Override
public int readMore( ByteBuffer dst ) throws SSLException {
return channel instanceof WrappedByteChannel ? ( (WrappedByteChannel) channel ).readMore( dst ) : 0;
}

@Override
public boolean isBlocking() {
if( channel instanceof SocketChannel )
return ( (SocketChannel) channel ).isBlocking();
else if( channel instanceof WrappedByteChannel )
return ( (WrappedByteChannel) channel ).isBlocking();
return false;
}

}
Loading

0 comments on commit e8c8fdc

Please sign in to comment.