X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Firc%2FConnection.java;h=f3f41f0459eb8352d078332211737ffd1f28cb01;hb=5fcb50ba350bda007995808df3034a8b6fbc60d5;hp=ec063f64c1de884b63919c086065f4116c837218;hpb=b310622663c0ec06565ac3996660c90dd40bb771;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java
index ec063f6..f3f41f0 100644
--- a/src/main/java/net/pterodactylus/irc/Connection.java
+++ b/src/main/java/net/pterodactylus/irc/Connection.java
@@ -35,6 +35,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.net.SocketFactory;
@@ -325,7 +326,9 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 	 * 		if an I/O error occurs
 	 */
 	public void close() throws IOException {
-		connectionHandler.close();
+		if (connectionHandler != null) {
+			connectionHandler.close();
+		}
 	}
 
 	//
@@ -344,6 +347,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 		/* connect to remote socket. */
 		try {
 			Socket socket = socketFactory.createSocket(hostname, port);
+			socket.setSoTimeout((int) TimeUnit.MINUTES.toMillis(3));
 			connectionHandler = new ConnectionHandler(socket.getInputStream(), socket.getOutputStream());
 
 			/* register connection. */