X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2FFcpConnectionHandler.java;h=aa897e21507753e0c12dec55e1fcb38dbd4c0dc1;hb=a30d521e1add957b2ddfee455bc6e061efbf44b7;hp=4d270383b7a3d6a8dbfe1d5be5eba308985025f3;hpb=631bb9032d93a7b89d949b103adb22bd9286ac4a;p=jFCPlib.git diff --git a/src/main/java/net/pterodactylus/fcp/FcpConnectionHandler.java b/src/main/java/net/pterodactylus/fcp/FcpConnectionHandler.java index 4d27038..aa897e2 100644 --- a/src/main/java/net/pterodactylus/fcp/FcpConnectionHandler.java +++ b/src/main/java/net/pterodactylus/fcp/FcpConnectionHandler.java @@ -1,9 +1,9 @@ /* - * jFCPlib - FcpConnectionHandler.java - Copyright © 2008 David Roden + * jFCPlib - FcpConnectionHandler.java - Copyright © 2008–2016 David Roden * - * This program is free software; you can redistribute it and/or modify + * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -12,12 +12,12 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ package net.pterodactylus.fcp; +import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; @@ -25,8 +25,6 @@ import java.nio.charset.Charset; import java.util.logging.Level; import java.util.logging.Logger; -import net.pterodactylus.util.logging.Logging; - /** * Handles an FCP connection to a node. * @@ -35,7 +33,7 @@ import net.pterodactylus.util.logging.Logging; class FcpConnectionHandler implements Runnable { /** The logger. */ - private static final Logger logger = Logging.getLogger(FcpConnectionHandler.class.getName()); + private static final Logger logger = Logger.getLogger(FcpConnectionHandler.class.getName()); /** The underlying connection. */ private final FcpConnection fcpConnection; @@ -66,6 +64,7 @@ class FcpConnectionHandler implements Runnable { /** * {@inheritDoc} */ + @Override public void run() { FcpMessage fcpMessage = null; Throwable throwable = null; @@ -77,8 +76,9 @@ class FcpConnectionHandler implements Runnable { } try { String line = readLine(); - logger.log(Level.FINEST, "read line: %1$s", line); + logger.log(Level.FINEST, String.format("read line: %1$s", line)); if (line == null) { + throwable = new EOFException(); break; } if (line.length() == 0) {