formatting
git-svn-id: https://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk@1623912 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java b/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
index fd79b9b..5004a2f 100644
--- a/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
+++ b/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
@@ -296,18 +296,21 @@
*/
private void applyProxy()
{
- if ( this.proxy != null ) {
+ if ( this.proxy != null )
+ {
ProxyInfo proxyInfo = new ProxyInfo();
- proxyInfo.setNonProxyHosts(this.proxy.getNonProxyHosts());
+ proxyInfo.setNonProxyHosts( this.proxy.getNonProxyHosts() );
- if (!ProxyUtils.validateNonProxyHosts(proxyInfo, url.getHost())) {
- HttpHost proxy = new HttpHost(this.proxy.getHost(), this.proxy.getPort(), this.proxy.getProtocol());
- httpClient.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
- if (this.proxy.getUsername() != null) {
+ if ( !ProxyUtils.validateNonProxyHosts( proxyInfo, url.getHost() ) )
+ {
+ HttpHost proxy = new HttpHost( this.proxy.getHost(), this.proxy.getPort(), this.proxy.getProtocol() );
+ httpClient.getParams().setParameter( ConnRoutePNames.DEFAULT_PROXY, proxy );
+ if ( this.proxy.getUsername() != null )
+ {
httpClient.getCredentialsProvider().setCredentials(
- new AuthScope(this.proxy.getHost(), this.proxy.getPort()),
- new UsernamePasswordCredentials(this.proxy.getUsername(), this.proxy.getPassword()));
+ new AuthScope( this.proxy.getHost(), this.proxy.getPort() ),
+ new UsernamePasswordCredentials( this.proxy.getUsername(), this.proxy.getPassword() ) );
}
}
}