git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
at last
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
utils
/
serial
/
server
/
ConnectAction.java
diff --git
a/src/be/nikiroo/utils/serial/server/ConnectAction.java
b/src/be/nikiroo/utils/serial/server/ConnectAction.java
index aafad62facfa5a3a3433df3a7aa54de8f23806b4..66d43e0e757f1912c753796bd95ec9c28cf93f75 100644
(file)
--- a/
src/be/nikiroo/utils/serial/server/ConnectAction.java
+++ b/
src/be/nikiroo/utils/serial/server/ConnectAction.java
@@
-252,7
+252,7
@@
abstract class ConnectAction {
* <p>
* Will only flush the data if there is contentToSend.
*
* <p>
* Will only flush the data if there is contentToSend.
*
- * @return the answer (which can be NULL)
+ * @return the answer (which can be NULL
if no more content
)
*
* @throws IOException
* in case of I/O error
*
* @throws IOException
* in case of I/O error
@@
-275,11
+275,12
@@
abstract class ConnectAction {
}
/**
}
/**
- * Read a possibly encrypted line.
+ * Read a possibly encrypted line
, or NULL if no more content
.
*
* @param in
* the stream to read from
*
* @param in
* the stream to read from
- * @return the unencrypted line
+ *
+ * @return the unencrypted line or NULL
*
*
* @throws IOException
*
*
* @throws IOException
@@
-288,19
+289,17
@@
abstract class ConnectAction {
* in case of crypt error
*/
private String readLine(NextableInputStream in) throws IOException {
* in case of crypt error
*/
private String readLine(NextableInputStream in) throws IOException {
- String line = null;
if (in.next()) {
if (in.next()) {
- line = IOUtils.readSmallStream(in);
- }
-
- if (line != null) {
+ String line = IOUtils.readSmallStream(in);
bytesReceived += line.length();
if (crypt != null) {
line = crypt.decrypt64s(line, false);
}
bytesReceived += line.length();
if (crypt != null) {
line = crypt.decrypt64s(line, false);
}
+
+ return line;
}
}
- return
line
;
+ return
null
;
}
/**
}
/**