[commons-net] branch master updated: Combine nested 'if' statement in 'else' block to 'else 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 6be2e1c  Combine nested 'if' statement in 'else' block to 'else if'.
6be2e1c is described below

commit 6be2e1c8574ebed40aed714f968d6767921ea5b3
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Feb 22 16:32:39 2021 -0500

    Combine nested 'if' statement in 'else' block to 'else if'.
---
 src/main/java/org/apache/commons/net/ftp/FTPSClient.java   |  8 +++-----
 .../net/ftp/parser/VMSVersioningFTPEntryParser.java        | 14 +++++---------
 src/test/java/org/apache/commons/net/tftp/TFTPServer.java  |  7 ++-----
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/apache/commons/net/ftp/FTPSClient.java 
b/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
index bde9314..c5c0f45 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
@@ -904,11 +904,9 @@ private KeyManager getKeyManager() {
         _controlOutput_ = new BufferedWriter(new OutputStreamWriter(
                 socket.getOutputStream(), getControlEncoding()));
 
-        if (isClientMode) {
-            if (hostnameVerifier != null &&
-                !hostnameVerifier.verify(_hostname_, socket.getSession())) {
-                throw new SSLHandshakeException("Hostname doesn't match 
certificate");
-            }
+        if (isClientMode && (hostnameVerifier != null &&
+            !hostnameVerifier.verify(_hostname_, socket.getSession()))) {
+            throw new SSLHandshakeException("Hostname doesn't match 
certificate");
         }
     }
 
diff --git 
a/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
 
b/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
index 865f774..e3e78d3 100644
--- 
a/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
+++ 
b/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
@@ -119,11 +119,9 @@ public class VMSVersioningFTPEntryParser extends 
VMSFTPEntryParser
                 final String version = result.group(2);
                 final Integer nv = Integer.valueOf(version);
                 final Integer existing = existingEntries.get(name);
-                if (null != existing) {
-                    if (nv.intValue() < existing.intValue()) {
-                        iter.remove();  // removes older version from original 
list.
-                        continue;
-                    }
+                if ((null != existing) && (nv.intValue() < 
existing.intValue())) {
+                    iter.remove();  // removes older version from original 
list.
+                    continue;
                 }
                 existingEntries.put(name, nv);
             }
@@ -143,10 +141,8 @@ public class VMSVersioningFTPEntryParser extends 
VMSFTPEntryParser
                 final String version = result.group(2);
                 final Integer nv = Integer.valueOf(version);
                 final Integer existing = existingEntries.get(name);
-                if (null != existing) {
-                    if (nv.intValue() < existing.intValue()) {
-                        iter.remove(); // removes older version from original 
list.
-                    }
+                if ((null != existing) && (nv.intValue() < 
existing.intValue())) {
+                    iter.remove(); // removes older version from original list.
                 }
             }
 
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPServer.java 
b/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
index f21be8b..20ce11f 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
@@ -673,11 +673,8 @@ public class TFTPServer implements Runnable
         if (localiface != null)
         {
             final Enumeration<InetAddress> ifaddrs = 
localiface.getInetAddresses();
-            if (ifaddrs != null)
-            {
-                if (ifaddrs.hasMoreElements()) {
-                    iaddr = ifaddrs.nextElement();
-                }
+            if ((ifaddrs != null) && ifaddrs.hasMoreElements()) {
+                iaddr = ifaddrs.nextElement();
             }
         }
         log_ = log == null ? nullStream: log;