You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2020/11/24 20:33:22 UTC

[httpcomponents-client] 04/07: Remove redundant returns.

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch 4.5.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git

commit 2e54182cdde9ae3ff0883d59f4039706c8082931
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 23 12:13:10 2020 -0500

    Remove redundant returns.
---
 .../src/main/java/org/apache/http/impl/client/WinHttpClients.java     | 4 ++--
 httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java   | 2 +-
 .../src/main/java/org/apache/http/impl/client/BasicAuthCache.java     | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/httpclient-win/src/main/java/org/apache/http/impl/client/WinHttpClients.java b/httpclient-win/src/main/java/org/apache/http/impl/client/WinHttpClients.java
index 396f20a..f0e6efa 100644
--- a/httpclient-win/src/main/java/org/apache/http/impl/client/WinHttpClients.java
+++ b/httpclient-win/src/main/java/org/apache/http/impl/client/WinHttpClients.java
@@ -59,8 +59,8 @@ public class WinHttpClients {
         if (os != null && os.contains("windows")) {
             try {
                 return Sspi.MAX_TOKEN_SIZE > 0;
-            } catch (final Exception ignore) { // Likely ClassNotFound
-                return false;
+            } catch (final Exception ignore) {
+                // Likely ClassNotFound
             }
         }
         return false;
diff --git a/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java b/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
index aa3431f..05c31e4 100644
--- a/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
+++ b/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
@@ -448,7 +448,7 @@ public class URIUtils {
                     try {
                         return new HttpHost(hostname, port, scheme);
                     } catch (final IllegalArgumentException ex) {
-                        return null;
+                        // ignore
                     }
                 }
             } else {
diff --git a/httpclient/src/main/java/org/apache/http/impl/client/BasicAuthCache.java b/httpclient/src/main/java/org/apache/http/impl/client/BasicAuthCache.java
index eeffd01..5b44656 100644
--- a/httpclient/src/main/java/org/apache/http/impl/client/BasicAuthCache.java
+++ b/httpclient/src/main/java/org/apache/http/impl/client/BasicAuthCache.java
@@ -134,12 +134,10 @@ public class BasicAuthCache implements AuthCache {
                 if (log.isWarnEnabled()) {
                     log.warn("Unexpected I/O error while de-serializing auth scheme", ex);
                 }
-                return null;
             } catch (final ClassNotFoundException ex) {
                 if (log.isWarnEnabled()) {
                     log.warn("Unexpected error while de-serializing auth scheme", ex);
                 }
-                return null;
             }
         }
         return null;