Merge pull request #374 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0

* commit 'f0dab164ebf469cc8ea8c896b6db84aacb4d602d':
  无JIRA任务 build failed

fine-httpcomponents/http-client/httpclient/src/main/java/com/fr/third/org/apache/http/conn/ssl/DefaultHostnameVerifier.java

@@ -299,4 +299,35 @@ public final class DefaultHostnameVerifier implements HostnameVerifier {
     static List<SubjectName> getSubjectAltNames(final X509Certificate cert) {
         try {
             final Collection<List<?>> entries = cert.getSubjectAlternativeNames();
-            if (entrie
+            if (entries == null) {
+                return Collections.emptyList();
+            }
+            final List<SubjectName> result = new ArrayList<SubjectName>();
+            for (List<?> entry: entries) {
+                final Integer type = entry.size() >= 2 ? (Integer) entry.get(0) : null;
+                if (type != null) {
+                    final String s = (String) entry.get(1);
+                    result.add(new SubjectName(s, type));
+                }
+            }
+            return result;
+        } catch (final CertificateParsingException ignore) {
+            return Collections.emptyList();
+        }
+    }
+
+    /*
+     * Normalize IPv6 or DNS name.
+     */
+    static String normaliseAddress(final String hostname) {
+        if (hostname == null) {
+            return hostname;
+        }
+        try {
+            final InetAddress inetAddress = InetAddress.getByName(hostname);
+            return inetAddress.getHostAddress();
+        } catch (final UnknownHostException unexpected) { // Should not happen, because we check for IPv6 address above
+            return hostname;
+        }
+    }
+}