Forward EOF exception to handler

[jFCPlib.git] / src / main / java / net / pterodactylus / fcp / FcpConnectionHandler.java

diff --git a/src/main/java/net/pterodactylus/fcp/FcpConnectionHandler.java b/src/main/java/net/pterodactylus/fcp/FcpConnectionHandler.java
index 263860a..256efef 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/FcpConnectionHandler.java
+++ b/src/main/java/net/pterodactylus/fcp/FcpConnectionHandler.java
@@ -18,6 +18,7 @@
 
 package net.pterodactylus.fcp;
 
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
@@ -25,8 +26,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 +34,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;
@@ -78,8 +77,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) {
@@ -101,7 +101,7 @@ class FcpConnectionHandler implements Runnable {
                                }
                                String field = line.substring(0, equalSign);
                                String value = line.substring(equalSign + 1);
-                               assert fcpMessage != null : "fcp message is null";
+                               assert fcpMessage != null: "fcp message is null";
                                fcpMessage.setField(field, value);
                        } catch (IOException ioe1) {
                                throwable = ioe1;