X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Firc%2FDccReceiver.java;h=e024d4e68cad4cfd635c34e3d53f7836996d9181;hb=82bcd4ba9cb14e6592fb3c4d3c8081319f4da564;hp=ed59c690978ec3e5ac3964db4cc9cb634fd1b9c1;hpb=ac4652c048ca9edbc8e4b2e0b1a5a8493299b423;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/irc/DccReceiver.java b/src/main/java/net/pterodactylus/irc/DccReceiver.java
index ed59c69..e024d4e 100644
--- a/src/main/java/net/pterodactylus/irc/DccReceiver.java
+++ b/src/main/java/net/pterodactylus/irc/DccReceiver.java
@@ -23,8 +23,6 @@ import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import net.pterodactylus.irc.event.DccDownloadFailed;
 import net.pterodactylus.irc.event.DccDownloadFinished;
@@ -34,6 +32,7 @@ import net.pterodactylus.xdcc.util.io.BandwidthCountingInputStream;
 import com.google.common.eventbus.EventBus;
 import com.google.common.io.Closeables;
 import com.google.common.util.concurrent.AbstractExecutionThreadService;
+import org.apache.log4j.Logger;
 
 /**
  * Service that receives a file offered by a {@link DccSendReceived}.
@@ -176,6 +175,7 @@ public class DccReceiver extends AbstractExecutionThreadService {
 		Socket socket = null;
 		try {
 			socket = new Socket(inetAddress, port);
+			socket.setSoTimeout((int) TimeUnit.MINUTES.toMillis(3));
 			InputStream socketInputStream = socket.getInputStream();
 			inputStream = new BandwidthCountingInputStream(socketInputStream, 5, TimeUnit.SECONDS);
 			byte[] buffer = new byte[65536];
@@ -195,7 +195,7 @@ public class DccReceiver extends AbstractExecutionThreadService {
 				eventBus.post(new DccDownloadFailed(this, new IOException("Download aborted.")));
 			}
 		} catch (IOException ioe1) {
-			logger.log(Level.WARNING, "I/O error while receiving DCC!", ioe1);
+			logger.warn("I/O error while receiving DCC!", ioe1);
 			eventBus.post(new DccDownloadFailed(this, ioe1));
 		} finally {
 			Closeables.close(inputStream, true);