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
commit bbb0a2c7a53ec323edee0d6374cb5b89e8322844 Author: Gary Gregory <[email protected]> AuthorDate: Sun Jun 16 11:44:05 2024 -0400 Fix PMD CollapsibleIfStatements in TerminalTypeOptionHandler --- .../commons/net/telnet/TerminalTypeOptionHandler.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java b/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java index fc7141a2..0a621aa8 100644 --- a/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java +++ b/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java @@ -76,19 +76,14 @@ public class TerminalTypeOptionHandler extends TelnetOptionHandler { */ @Override public int[] answerSubnegotiation(final int suboptionData[], final int suboptionLength) { - if (suboptionData != null && suboptionLength > 1 && termType != null) { - if (suboptionData[0] == TERMINAL_TYPE && suboptionData[1] == TERMINAL_TYPE_SEND) { - final int[] response = new int[termType.length() + 2]; - - response[0] = TERMINAL_TYPE; - response[1] = TERMINAL_TYPE_IS; - - for (int ii = 0; ii < termType.length(); ii++) { - response[ii + 2] = termType.charAt(ii); - } - - return response; + if (suboptionData != null && suboptionLength > 1 && termType != null && suboptionData[0] == TERMINAL_TYPE && suboptionData[1] == TERMINAL_TYPE_SEND) { + final int[] response = new int[termType.length() + 2]; + response[0] = TERMINAL_TYPE; + response[1] = TERMINAL_TYPE_IS; + for (int ii = 0; ii < termType.length(); ii++) { + response[ii + 2] = termType.charAt(ii); } + return response; } return null; }
