[commons-net] branch master updated: Raise embedded if into parent if.

[ggregory]

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 c6efd4a  Raise embedded if into parent if.
c6efd4a is described below

commit c6efd4a1e3750a196fd1e367e16156fda20e5a96
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Feb 28 12:45:40 2021 -0500

    Raise embedded if into parent if.
---
 .../java/org/apache/commons/net/telnet/Telnet.java | 43 ++++++++--------------
 1 file changed, 16 insertions(+), 27 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 66468b2..65b9185 100644
--- a/src/main/java/org/apache/commons/net/telnet/Telnet.java
+++ b/src/main/java/org/apache/commons/net/telnet/Telnet.java
@@ -465,14 +465,9 @@ class Telnet extends SocketClient
         if (optionHandlers[option] != null)
         {
             acceptNewState = optionHandlers[option].getAcceptLocal();
-        } else /* open TelnetOptionHandler functionality (end)*/
-        /* TERMINAL-TYPE option (start)*/
-        if (option == TERMINAL_TYPE)
+        } else if (option == TERMINAL_TYPE && terminalType != null && 
!terminalType.isEmpty())
         {
-            if (terminalType != null && !terminalType.isEmpty())
-            {
-                acceptNewState = true;
-            }
+            acceptNewState = true;
         }
         /* TERMINAL-TYPE option (end)*/
       /* open TelnetOptionHandler functionality (start)*/
@@ -1018,19 +1013,16 @@ class Telnet extends SocketClient
         options[option] |= DO_MASK;
 
         /* open TelnetOptionHandler functionality (start)*/
-        if (requestedDo(option))
+        if (requestedDo(option) && (optionHandlers[option] != null))
         {
-            if (optionHandlers[option] != null)
-            {
-                optionHandlers[option].setDo(true);
+            optionHandlers[option].setDo(true);
 
-                final int[] subneg =
-                    optionHandlers[option].startSubnegotiationRemote();
+            final int[] subneg =
+                optionHandlers[option].startSubnegotiationRemote();
 
-                if (subneg != null)
-                {
-                    _sendSubnegotiation(subneg);
-                }
+            if (subneg != null)
+            {
+                _sendSubnegotiation(subneg);
             }
         }
         /* open TelnetOptionHandler functionality (end)*/
@@ -1105,19 +1097,16 @@ class Telnet extends SocketClient
         options[option] |= WILL_MASK;
 
         /* open TelnetOptionHandler functionality (start)*/
-        if (requestedWill(option))
+        if (requestedWill(option) && (optionHandlers[option] != null))
         {
-            if (optionHandlers[option] != null)
-            {
-                optionHandlers[option].setWill(true);
+            optionHandlers[option].setWill(true);
 
-                final int[] subneg =
-                    optionHandlers[option].startSubnegotiationLocal();
+            final int[] subneg =
+                optionHandlers[option].startSubnegotiationLocal();
 
-                if (subneg != null)
-                {
-                    _sendSubnegotiation(subneg);
-                }
+            if (subneg != null)
+            {
+                _sendSubnegotiation(subneg);
             }
         }
         /* open TelnetOptionHandler functionality (end)*/