You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2025/01/28 19:02:44 UTC
(commons-net) branch master updated: Refactor NUL magic char
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git
The following commit(s) were added to refs/heads/master by this push:
new 0c313573 Refactor NUL magic char
0c313573 is described below
commit 0c313573e3f6d5936d580d28a7bd3eb98a18572d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jan 28 14:02:39 2025 -0500
Refactor NUL magic char
---
src/main/java/org/apache/commons/net/telnet/Telnet.java | 2 ++
src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java | 2 +-
src/main/java/org/apache/commons/net/telnet/TelnetOutputStream.java | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/telnet/Telnet.java b/src/main/java/org/apache/commons/net/telnet/Telnet.java
index 15656997..b02ad436 100644
--- a/src/main/java/org/apache/commons/net/telnet/Telnet.java
+++ b/src/main/java/org/apache/commons/net/telnet/Telnet.java
@@ -117,6 +117,8 @@ class Telnet extends SocketClient {
*/
private TelnetNotificationHandler notifhand;
+ static final char NUL = '\0';
+
/**
* Empty Constructor
*/
diff --git a/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java b/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
index 2ca4d1c9..88a73148 100644
--- a/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
+++ b/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
@@ -296,7 +296,7 @@ final class TelnetInputStream extends BufferedInputStream implements Runnable {
switch (receiveState) {
case STATE_CR:
- if (ch == '\0') {
+ if (ch == Telnet.NUL) {
// Strip null
continue;
}
diff --git a/src/main/java/org/apache/commons/net/telnet/TelnetOutputStream.java b/src/main/java/org/apache/commons/net/telnet/TelnetOutputStream.java
index f90e9e47..4f9f99ef 100644
--- a/src/main/java/org/apache/commons/net/telnet/TelnetOutputStream.java
+++ b/src/main/java/org/apache/commons/net/telnet/TelnetOutputStream.java
@@ -104,7 +104,7 @@ final class TelnetOutputStream extends OutputStream {
}
} // __convertCRtoCRLF
else if (ch != '\n') {
- client.sendByte('\0'); // RFC854 requires CR NUL for bare CR
+ client.sendByte(Telnet.NUL); // RFC854 requires CR NUL for bare CR
}
}