made WebSocket.getLocalSocketAddress and WebSocket.getRemoteSocketAddress more reliable by making them never return null unlike their counterparts Socket.getLocalSocketAddress and Socket.getRemoteSocketAddress (TooTallNate#149)

Davidiusdadi · Davidiusdadi · commit 774bc894392e · 2013-01-13T23:36:53.000+01:00
diff --git a/src/main/java/org/java_websocket/WebSocket.java b/src/main/java/org/java_websocket/WebSocket.java
@@ -1,7 +1,6 @@
 package org.java_websocket;
 
 import java.net.InetSocketAddress;
-import java.net.Socket;
 import java.nio.ByteBuffer;
 import java.nio.channels.NotYetConnectedException;
 
@@ -63,14 +62,12 @@ public enum READYSTATE {
 	public abstract boolean hasBufferedData();
 
 	/**
-	 * @returns null when connections is closed
-	 * @see Socket#getRemoteSocketAddress()
+	 * @returns never returns null
 	 */
 	public abstract InetSocketAddress getRemoteSocketAddress();
 
 	/**
-	 * @returns null when connections is closed
-	 * @see Socket#getLocalSocketAddress()
+	 * @returns never returns null
 	 */
 	public abstract InetSocketAddress getLocalSocketAddress();
 
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -58,8 +58,8 @@ public class WebSocketImpl implements WebSocket {
 
 	public SelectionKey key;
 
-	/* only used to obtain the socket addresses*/
-	public final Socket socket;
+	private final InetSocketAddress localSocketAddress;
+	private final InetSocketAddress remoteSocketAddress;
 	/** the possibly wrapped channel object whose selection is controlled by {@link #key} */
 	public ByteChannel channel;
 	/**
@@ -122,13 +122,22 @@ public WebSocketImpl( WebSocketListener listener , List<Draft> drafts , Socket s
 	 * crates a websocket with client role
 	 */
 	public WebSocketImpl( WebSocketListener listener , Draft draft , Socket sock ) {
+		if( listener == null || sock == null || ( draft == null && role == Role.SERVER ) )
+			throw new IllegalArgumentException( "parameters must not be null" );
+		if( !sock.isBound() ) {
+			throw new IllegalArgumentException( "socket has to be bound" );
+		}
 		this.outQueue = new LinkedBlockingQueue<ByteBuffer>();
 		inQueue = new LinkedBlockingQueue<ByteBuffer>();
 		this.wsl = listener;
 		this.role = Role.CLIENT;
 		if( draft != null )
 			this.draft = draft.copyInstance();
-		this.socket = sock;
+
+		localSocketAddress = (InetSocketAddress) sock.getLocalSocketAddress();
+		remoteSocketAddress = (InetSocketAddress) sock.getRemoteSocketAddress();
+		assert ( localSocketAddress != null );
+		assert ( remoteSocketAddress != null );
 	}
 
 	/**
@@ -682,12 +691,12 @@ public String toString() {
 
 	@Override
 	public InetSocketAddress getRemoteSocketAddress() {
-		return (InetSocketAddress) socket.getRemoteSocketAddress();
+		return remoteSocketAddress;
 	}
 
 	@Override
 	public InetSocketAddress getLocalSocketAddress() {
-		return (InetSocketAddress) socket.getLocalSocketAddress();
+		return localSocketAddress;
 	}
 
 	@Override
