-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix connecting hang from replaying a second time
Revises the following: TooTallNate/Java-WebSocket#341 TooTallNate/Java-WebSocket#373 blackrock/Java-WebSocket@a7fb7f5
- Loading branch information
Showing
43 changed files
with
7,970 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 100 additions & 0 deletions
100
src/main/java/org/java_websocket/AbstractWrappedByteChannel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | ||
} | ||
|
||
} |
Oops, something went wrong.