Merge pull request #2922 from kfeuz/Issue2576

Fixes NPE when calling ip() on disconnected clients.
This commit is contained in:
Ben Fry
2014-11-14 14:43:04 -07:00

View File

@@ -51,7 +51,6 @@ public class Client implements Runnable {
Thread thread;
Socket socket;
String ip;
int port;
String host;
@@ -274,7 +273,10 @@ public class Client implements Runnable {
* @brief Returns the IP address of the machine as a String
*/
public String ip() {
return socket.getInetAddress().getHostAddress();
if (socket != null){
return socket.getInetAddress().getHostAddress();
}
return null;
}