Merge pull request TooTallNate#214 from directi/master

Davidiusdadi · Davidiusdadi · commit 7c3b223536dc · 2013-10-27T14:32:28.000-07:00
Fix WebSocketClient.getRemoteSocketAddress
diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java
@@ -328,7 +328,7 @@ public InetSocketAddress getLocalSocketAddress( WebSocket conn ) {
 	@Override
 	public InetSocketAddress getRemoteSocketAddress( WebSocket conn ) {
 		if( socket != null )
-			return (InetSocketAddress) socket.getLocalSocketAddress();
+			return (InetSocketAddress) socket.getRemoteSocketAddress();
 		return null;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ public InetSocketAddress getLocalSocketAddress( WebSocket conn ) {`
`328`	`328`	`@Override`
`329`	`329`	`public InetSocketAddress getRemoteSocketAddress( WebSocket conn ) {`
`330`	`330`	`if( socket != null )`
`331`		`- return (InetSocketAddress) socket.getLocalSocketAddress();`
	`331`	`+ return (InetSocketAddress) socket.getRemoteSocketAddress();`
`332`	`332`	`return null;`
`333`	`333`	`}`
`334`	`334`