Raise embedded if into parent if.

apache · Feb 28, 2021 · c6efd4a · c6efd4a
1 parent 6be2e1c
commit c6efd4a
Showing 1 changed file with 16 additions and 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
@@ -465,14 +465,9 @@ void processDo(final int option) throws IOException
         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 @@ void setDo(final int option) throws IOException
         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 @@ void setWill(final int option) throws IOException
         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)*/