projects
/
jFCPlib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update license to GPLv3, fix header comments
[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
dbf0969
..
aa897e2
100644
(file)
--- 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
* 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,
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@
-12,16
+12,18
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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 <http://www.gnu.org/licenses/>.
*/
package net.pterodactylus.fcp;
*/
package net.pterodactylus.fcp;
+import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/**
* Handles an FCP connection to a node.
/**
* Handles an FCP connection to a node.
@@
-30,6
+32,9
@@
import java.nio.charset.Charset;
*/
class FcpConnectionHandler implements Runnable {
*/
class FcpConnectionHandler implements Runnable {
+ /** The logger. */
+ private static final Logger logger = Logger.getLogger(FcpConnectionHandler.class.getName());
+
/** The underlying connection. */
private final FcpConnection fcpConnection;
/** The underlying connection. */
private final FcpConnection fcpConnection;
@@
-59,6
+64,7
@@
class FcpConnectionHandler implements Runnable {
/**
* {@inheritDoc}
*/
/**
* {@inheritDoc}
*/
+ @Override
public void run() {
FcpMessage fcpMessage = null;
Throwable throwable = null;
public void run() {
FcpMessage fcpMessage = null;
Throwable throwable = null;
@@
-70,8
+76,9
@@
class FcpConnectionHandler implements Runnable {
}
try {
String line = readLine();
}
try {
String line = readLine();
-
System.out.println("read line: " + line
);
+
logger.log(Level.FINEST, String.format("read line: %1$s", line)
);
if (line == null) {
if (line == null) {
+ throwable = new EOFException();
break;
}
if (line.length() == 0) {
break;
}
if (line.length() == 0) {