java-codehunger
diff --git a/‎src/main/example/ServerStressTest.java‎
Lines changed: 2 additions & 2 deletions b/‎src/main/example/ServerStressTest.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/main/java/org/java_websocket/AbstractWebSocket.java‎
Lines changed: 23 additions & 14 deletions b/‎src/main/java/org/java_websocket/AbstractWebSocket.java‎
Lines changed: 23 additions & 14 deletions
diff --git a/‎src/main/java/org/java_websocket/AbstractWrappedByteChannel.java‎
Lines changed: 11 additions & 0 deletions b/‎src/main/java/org/java_websocket/AbstractWrappedByteChannel.java‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎src/main/java/org/java_websocket/SSLSocketChannel2.java‎
Lines changed: 1 addition & 4 deletions b/‎src/main/java/org/java_websocket/SSLSocketChannel2.java‎
Lines changed: 1 addition & 4 deletions
diff --git a/‎src/main/java/org/java_websocket/WebSocket.java‎
Lines changed: 6 additions & 20 deletions b/‎src/main/java/org/java_websocket/WebSocket.java‎
Lines changed: 6 additions & 20 deletions
@@ -29,7 +29,6 @@
 import java.awt.event.ActionListener;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.nio.channels.NotYetConnectedException;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -47,6 +46,7 @@
 import javax.swing.event.ChangeListener;
 
 import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.exceptions.WebsocketNotConnectedException;
 
 public class ServerStressTest extends JFrame {
 	private JSlider clients;
@@ -225,7 +225,7 @@ public void send() {
 			for( WebSocketClient cl : websockets ) {
 				try {
 					cl.send( payload );
-				} catch ( NotYetConnectedException e ) {
+				} catch ( WebsocketNotConnectedException e ) {
 					notyetconnected++;
 				}
 			}
 
@@ -169,21 +169,8 @@ public void run() {
 				try {
 					connections.addAll( getConnections() );
 					long current = ( System.currentTimeMillis() - ( connectionLostTimeout * 1500 ) );
-					WebSocketImpl webSocketImpl;
 					for( WebSocket conn : connections ) {
-						if( conn instanceof WebSocketImpl ) {
-							webSocketImpl = ( WebSocketImpl ) conn;
-							if( webSocketImpl.getLastPong() < current ) {
-								log.trace("Closing connection due to no pong received: {}", conn);
-								webSocketImpl.closeConnection( CloseFrame.ABNORMAL_CLOSE, "The connection was closed because the other endpoint did not respond with a pong in time. For more information check: https://github.com/TooTallNate/Java-WebSocket/wiki/Lost-connection-detection" );
-							} else {
-								if( webSocketImpl.isOpen() ) {
-									webSocketImpl.sendPing();
-								} else {
-									log.trace("Trying to ping a non open connection: {}", conn);
-								}
-							}
-						}
+						executeConnectionLostDetection(conn, current);
 					}
 				} catch ( Exception e ) {
 					//Ignore this exception
@@ -195,6 +182,28 @@ public void run() {
 
 	}
 
+	/**
+	 * Send a ping to the endpoint or close the connection since the other endpoint did not respond with a ping
+	 * @param webSocket the websocket instance
+	 * @param current the current time in milliseconds
+	 */
+	private void executeConnectionLostDetection(WebSocket webSocket, long current) {
+		if (!(webSocket instanceof WebSocketImpl)) {
+			return;
+		}
+		WebSocketImpl webSocketImpl = (WebSocketImpl) webSocket;
+		if( webSocketImpl.getLastPong() < current ) {
+			log.trace("Closing connection due to no pong received: {}", webSocketImpl);
+			webSocketImpl.closeConnection( CloseFrame.ABNORMAL_CLOSE, "The connection was closed because the other endpoint did not respond with a pong in time. For more information check: https://github.com/TooTallNate/Java-WebSocket/wiki/Lost-connection-detection" );
+		} else {
+			if( webSocketImpl.isOpen() ) {
+				webSocketImpl.sendPing();
+			} else {
+				log.trace("Trying to ping a non open connection: {}", webSocketImpl);
+			}
+		}
+	}
+
 	/**
      * Getter to get all the currently available connections
      * @return the currently available connections
 
@@ -30,15 +30,26 @@
 import java.nio.channels.ByteChannel;
 import java.nio.channels.SocketChannel;
 
+/*
+ * @deprecated
+ */
 @Deprecated
 public class AbstractWrappedByteChannel implements WrappedByteChannel {
 
 	private final ByteChannel channel;
 
+	/*
+	 * @deprecated
+	 */
+	@Deprecated
 	public AbstractWrappedByteChannel( ByteChannel towrap ) {
 		this.channel = towrap;
 	}
 
+	/*
+	 * @deprecated
+	 */
+	@Deprecated
 	public AbstractWrappedByteChannel( WrappedByteChannel towrap ) {
 		this.channel = towrap;
 	}
 
@@ -115,17 +115,14 @@ public SSLSocketChannel2( SocketChannel channel , SSLEngine sslEngine , Executor
 
     private void consumeFutureUninterruptible( Future<?> f ) {
         try {
-            boolean interrupted = false;
             while ( true ) {
                 try {
                     f.get();
                     break;
                 } catch ( InterruptedException e ) {
-                    interrupted = true;
+                    Thread.currentThread().interrupt();
                 }
             }
-            if( interrupted )
-                Thread.currentThread().interrupt();
         } catch ( ExecutionException e ) {
             throw new RuntimeException( e );
         }
 
@@ -27,30 +27,16 @@
 
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
-import java.nio.channels.NotYetConnectedException;
 import java.util.Collection;
 
 import org.java_websocket.drafts.Draft;
 import org.java_websocket.enums.Opcode;
 import org.java_websocket.enums.ReadyState;
+import org.java_websocket.exceptions.WebsocketNotConnectedException;
 import org.java_websocket.framing.Framedata;
 
 public interface WebSocket {
 
-	/**
-	 * The default port of WebSockets, as defined in the spec. If the nullary
-	 * constructor is used, DEFAULT_PORT will be the port the WebSocketServer
-	 * is binded to. Note that ports under 1024 usually require root permissions.
-	 */
-	int DEFAULT_PORT = 80;
-
-	/**
-	 * The default wss port of WebSockets, as defined in the spec. If the nullary
-	 * constructor is used, DEFAULT_WSS_PORT will be the port the WebSocketServer
-	 * is binded to. Note that ports under 1024 usually require root permissions.
-	 */
-	int DEFAULT_WSS_PORT = 443;
-
 	/**
 	 * sends the closing handshake.
 	 * may be send in response to an other handshake.
@@ -81,7 +67,7 @@ public interface WebSocket {
 	 * Send Text data to the other end.
 	 *
 	 * @param text the text data to send
-	 * @throws NotYetConnectedException websocket is not yet connected
+	 * @throws WebsocketNotConnectedException websocket is not yet connected
 	 */
 	void send( String text );
 
@@ -90,7 +76,7 @@ public interface WebSocket {
 	 *
 	 * @param bytes the binary data to send
 	 * @throws IllegalArgumentException the data is null
-	 * @throws NotYetConnectedException websocket is not yet connected
+	 * @throws WebsocketNotConnectedException websocket is not yet connected
 	 */
 	void send( ByteBuffer bytes );
 
@@ -99,7 +85,7 @@ public interface WebSocket {
 	 *
 	 * @param bytes the byte array to send
 	 * @throws IllegalArgumentException the data is null
-	 * @throws NotYetConnectedException websocket is not yet connected
+	 * @throws WebsocketNotConnectedException websocket is not yet connected
 	 */
 	void send( byte[] bytes );
 
@@ -117,9 +103,9 @@ public interface WebSocket {
 
 	/**
 	 * Send a ping to the other end
-	 * @throws NotYetConnectedException websocket is not yet connected
+	 * @throws WebsocketNotConnectedException websocket is not yet connected
 	 */
-	void sendPing() throws NotYetConnectedException;
+	void sendPing();
 
 	/**
 	 * Allows to send continuous/fragmented frames conveniently. <br>
Original file line number	Diff line number	Diff line change
`@@ -115,17 +115,14 @@ public SSLSocketChannel2( SocketChannel channel , SSLEngine sslEngine , Executor`
`115`	`115`
`116`	`116`	`private void consumeFutureUninterruptible( Future<?> f ) {`
`117`	`117`	`try {`
`118`		`- boolean interrupted = false;`
`119`	`118`	`while ( true ) {`
`120`	`119`	`try {`
`121`	`120`	`f.get();`
`122`	`121`	`break;`
`123`	`122`	`} catch ( InterruptedException e ) {`
`124`		`- interrupted = true;`
	`123`	`+ Thread.currentThread().interrupt();`
`125`	`124`	`}`
`126`	`125`	`}`
`127`		`- if( interrupted )`
`128`		`- Thread.currentThread().interrupt();`
`129`	`126`	`} catch ( ExecutionException e ) {`
`130`	`127`	`throw new RuntimeException( e );`
`131`	`128`	`}`