commit 34253e3d56e306a5dc1708e84f75bfbdefef1109
author Michael Osipov <michaelo@apache.org> Sat May 02 23:45:53 2020 +0200
committer Michael Osipov <michaelo@apache.org> Sat May 02 23:45:53 2020 +0200
tree 54a5f7143f5143c667787d5b1d961a99f049a211
parent 6966aff550f96f3664c10f2802ff315aeb21f412

Apply consistent naming for auth scopes

wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java

diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
index 51d24cf..1d2bf0f 100644
--- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
+++ b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
@@ -610,10 +610,9 @@
             {
                 Credentials creds = new UsernamePasswordCredentials( username, password );
 
-                String host = getRepository().getHost();
-                int port = getRepository().getPort();
-
-                credentialsProvider.setCredentials( getBasicAuthScope().getScope( host, port ), creds );
+                AuthScope targetScope = getBasicAuthScope().getScope( getRepository().getHost(),
+                                                                    getRepository().getPort() );
+                credentialsProvider.setCredentials( targetScope, creds );
             }
         }
 
@@ -639,10 +638,8 @@
                         creds = new UsernamePasswordCredentials( proxyUsername, proxyPassword );
                     }
 
-                    int proxyPort = proxyInfo.getPort();
-
-                    AuthScope authScope = getProxyBasicAuthScope().getScope( proxyHost, proxyPort );
-                    credentialsProvider.setCredentials( authScope, creds );
+                    AuthScope proxyScope = getProxyBasicAuthScope().getScope( proxyHost, proxyInfo.getPort() );
+                    credentialsProvider.setCredentials( proxyScope, creds );
                 }
             }
         }