hc-commits mailing list archives

Author: ggregory
Date: Tue Mar 28 15:57:34 2017
New Revision: 1789171

URL: http://svn.apache.org/viewvc?rev=1789171&view=rev
Log:
Statement unnecessarily nested within else clause.

Modified:
    httpcomponents/httpclient/branches/4.6.x/httpclient/src/main/java/org/apache/http/conn/ssl/DefaultHostnameVerifier.java

Modified: httpcomponents/httpclient/branches/4.6.x/httpclient/src/main/java/org/apache/http/conn/ssl/DefaultHostnameVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.6.x/httpclient/src/main/java/org/apache/http/conn/ssl/DefaultHostnameVerifier.java?rev=1789171&r1=1789170&r2=1789171&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.6.x/httpclient/src/main/java/org/apache/http/conn/ssl/DefaultHostnameVerifier.java
(original)
+++ httpcomponents/httpclient/branches/4.6.x/httpclient/src/main/java/org/apache/http/conn/ssl/DefaultHostnameVerifier.java
Tue Mar 28 15:57:34 2017
@@ -284,14 +284,13 @@ public final class DefaultHostnameVerifi
     static HostNameType determineHostFormat(final String host) {
         if (InetAddressUtils.isIPv4Address(host)) {
             return HostNameType.IPv4;
-        } else {
-            String s = host;
-            if (s.startsWith("[") && s.endsWith("]")) {
-                s = host.substring(1, host.length() - 1);
-            }
-            if (InetAddressUtils.isIPv6Address(s)) {
-                return HostNameType.IPv6;
-            }
+        }
+        String s = host;
+        if (s.startsWith("[") && s.endsWith("]")) {
+            s = host.substring(1, host.length() - 1);
+        }
+        if (InetAddressUtils.isIPv6Address(s)) {
+            return HostNameType.IPv6;
         }
         return HostNameType.DNS;
     }