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 2015/08/26 23:23:47 UTC

svn commit: r1698005 - in /httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl: auth/win/WindowsNegotiateScheme.java client/WinHttpClients.java

Author: ggregory
Date: Wed Aug 26 21:23:47 2015
New Revision: 1698005

URL: http://svn.apache.org/r1698005
Log:
Statement unnecessarily nested within else clause.

Modified:
    httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java
    httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/client/WinHttpClients.java

Modified: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java?rev=1698005&r1=1698004&r2=1698005&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java Wed Aug 26 21:23:47 2015
@@ -202,9 +202,8 @@ public class WindowsNegotiateScheme impl
                 failAuthCleanup();
                 if (ex instanceof Win32Exception) {
                     throw new AuthenticationException("Authentication Failed", ex);
-                } else {
-                    throw ex;
                 }
+                throw ex;
             }
         } else if (challenge == null || challenge.isEmpty()) {
             failAuthCleanup();
@@ -220,9 +219,8 @@ public class WindowsNegotiateScheme impl
                 failAuthCleanup();
                 if (ex instanceof Win32Exception) {
                     throw new AuthenticationException("Authentication Failed", ex);
-                } else {
-                    throw ex;
                 }
+                throw ex;
             }
         }
         return scheme + " " + response;

Modified: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/client/WinHttpClients.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/client/WinHttpClients.java?rev=1698005&r1=1698004&r2=1698005&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/client/WinHttpClients.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/client/WinHttpClients.java Wed Aug 26 21:23:47 2015
@@ -74,9 +74,8 @@ public class WinHttpClients {
                     .build();
             return HttpClientBuilder.create()
                     .setDefaultAuthSchemeRegistry(authSchemeRegistry);
-        } else {
-            return HttpClientBuilder.create();
         }
+        return HttpClientBuilder.create();
     }
 
     /**