projects
/
xudocci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Colourize output.
[xudocci.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
irc
/
Connection.java
diff --git
a/src/main/java/net/pterodactylus/irc/Connection.java
b/src/main/java/net/pterodactylus/irc/Connection.java
index
15dde44
..
336fdae
100644
(file)
--- 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.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;
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.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;
import net.pterodactylus.irc.event.UnknownReplyReceived;
import net.pterodactylus.irc.util.RandomNickname;
import net.pterodactylus.xdcc.util.io.BandwidthCountingInputStream;
@@
-324,7
+326,9
@@
public class Connection extends AbstractExecutionThreadService implements Servic
* if an I/O error occurs
*/
public void close() throws IOException {
* if an I/O error occurs
*/
public void close() throws IOException {
- connectionHandler.close();
+ if (connectionHandler != null) {
+ connectionHandler.close();
+ }
}
//
}
//
@@
-343,6
+347,7
@@
public class Connection extends AbstractExecutionThreadService implements Servic
/* connect to remote socket. */
try {
Socket socket = socketFactory.createSocket(hostname, port);
/* 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. */
connectionHandler = new ConnectionHandler(socket.getInputStream(), socket.getOutputStream());
/* register connection. */
@@
-373,6
+378,7
@@
public class Connection extends AbstractExecutionThreadService implements Servic
while (connected) {
Reply reply = connectionHandler.readReply();
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();
logger.finest(String.format("<< %s", reply));
String command = reply.command();
List<String> parameters = reply.parameters();
@@
-511,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 (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.");
} finally {
established = false;
logger.info("Closing Connection.");
@@
-550,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]));
}
} 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 {
if (port.isPresent()) {
eventBus.post(new DccAcceptReceived(this, client, messageWords[2], port.get(), position));
} else {
@@
-739,6
+748,7
@@
public class Connection extends AbstractExecutionThreadService implements Servic
public void close() throws IOException {
Closeables.close(outputStream, true);
Closeables.close(inputStreamReader, true);
public void close() throws IOException {
Closeables.close(outputStream, true);
Closeables.close(inputStreamReader, true);
+ Closeables.close(inputStream, true);
}
}
}
}