X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Firc%2FConnection.java;h=336fdae2ea31b7b1ed1777ba756aaabdeb6e13b2;hb=906ac6511a9b1a77d954e4fdedc0d8e3dd26e6d0;hp=2feaec4b3f45b493245c68934eb0dd5c307b472b;hpb=380eca88742353dd1b2411c50e6bf1a964fe19c2;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java
index 2feaec4..336fdae 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;
@@ -59,6 +60,7 @@ import net.pterodactylus.irc.event.NicknameInUseReceived;
 import net.pterodactylus.irc.event.NoNicknameGivenReceived;
 import net.pterodactylus.irc.event.PrivateMessageReceived;
 import net.pterodactylus.irc.event.PrivateNoticeReceived;
+import net.pterodactylus.irc.event.ReplyReceived;
 import net.pterodactylus.irc.event.UnknownReplyReceived;
 import net.pterodactylus.irc.util.RandomNickname;
 import net.pterodactylus.xdcc.util.io.BandwidthCountingInputStream;
@@ -148,6 +150,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 
 	/**
 	 * Returns the hostname of the remote end of the connection.
+	 *
 	 * @return The remote’s hostname
 	 */
 	public String hostname() {
@@ -156,6 +159,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 
 	/**
 	 * Returns the port number of the remote end of the connection.
+	 *
 	 * @return The remote’s port number
 	 */
 	public int port() {
@@ -322,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();
+		}
 	}
 
 	//
@@ -341,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. */
@@ -371,6 +378,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 
 			while (connected) {
 				Reply reply = connectionHandler.readReply();
+				eventBus.post(new ReplyReceived(this, reply));
 				logger.finest(String.format("<< %s", reply));
 				String command = reply.command();
 				List<String> parameters = reply.parameters();
@@ -509,6 +517,9 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 		} catch (IOException ioe1) {
 			logger.log(Level.WARNING, "I/O error", ioe1);
 			eventBus.post(new ConnectionClosed(this, ioe1));
+		} catch (RuntimeException re1) {
+			logger.log(Level.SEVERE, "Runtime error", re1);
+			eventBus.post(new ConnectionClosed(this, re1));
 		} finally {
 			established = false;
 			logger.info("Closing Connection.");
@@ -548,7 +559,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 				}
 			} else if (messageWords[1].equalsIgnoreCase("ACCEPT")) {
 				Optional<Integer> port = Optional.fromNullable(Ints.tryParse(messageWords[3]));
-				long position = Optional.fromNullable(Longs.tryParse(messageWords[4])).or(-1L);
+				long position = (messageWords.length > 4) ? Optional.fromNullable(Longs.tryParse(messageWords[4])).or(-1L) : -1;
 				if (port.isPresent()) {
 					eventBus.post(new DccAcceptReceived(this, client, messageWords[2], port.get(), position));
 				} else {
@@ -737,6 +748,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 		public void close() throws IOException {
 			Closeables.close(outputStream, true);
 			Closeables.close(inputStreamReader, true);
+			Closeables.close(inputStream, true);
 		}
 
 	}