svn commit: r1623912 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java

[olamy]

Author: olamy
Date: Wed Sep 10 05:53:39 2014
New Revision: 1623912

URL: http://svn.apache.org/r1623912
Log:
formatting

Modified:
    
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java

Modified: 
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java?rev=1623912&r1=1623911&r2=1623912&view=diff
==============================================================================
--- 
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
 (original)
+++ 
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
 Wed Sep 10 05:53:39 2014
@@ -296,18 +296,21 @@ public class TomcatManager
      */
     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() ) );
                 }
             }
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org