diff options
| author | Olivier Lamy <olamy@apache.org> | 2015-01-16 14:57:28 +1100 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2015-01-16 14:57:28 +1100 |
| commit | 66a67966e6d7fc59beb4bd24bc0931b37fafb041 (patch) | |
| tree | d4a34cbea49bbb4e4d84d17d5f4737608c9a7415 /archiva-modules/archiva-base | |
| parent | b141b830d748a5d6d6c89e8a543a1ae08f1b5927 (diff) | |
| download | archiva-66a67966e6d7fc59beb4bd24bc0931b37fafb041.tar.gz archiva-66a67966e6d7fc59beb4bd24bc0931b37fafb041.zip | |
fix toString and upgrade httpclient version
Diffstat (limited to 'archiva-modules/archiva-base')
2 files changed, 12 insertions, 1 deletions
diff --git a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java index 75a262792..0e297f508 100644 --- a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java +++ b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java @@ -153,4 +153,15 @@ public class WagonFactoryRequest result = 31 * result + ( userAgent != null ? userAgent.hashCode() : 0 ); return result; } + + @Override + public String toString() + { + return "WagonFactoryRequest{" + + "protocol='" + protocol + '\'' + + ", headers=" + headers + + ", userAgent='" + userAgent + '\'' + + ", networkProxy=" + networkProxy + + '}'; + } } diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java index 7df353dc0..4f7242889 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java @@ -189,7 +189,7 @@ public class NetworkProxy sb.append( ", host='" ).append( host ).append( '\'' ); sb.append( ", port=" ).append( port ); sb.append( ", username='" ).append( username ).append( '\'' ); - sb.append( ", password='" ).append( password ).append( '\'' ); + //sb.append( ", password='" ).append( password ).append( '\'' ); sb.append( ", useNtlm=" ).append( useNtlm ); sb.append( '}' ); return sb.toString(); |