# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: D:\coding\maven-2.0.x\maven-core
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: src/main/java/org/apache/maven/DefaultMaven.java
--- src/main/java/org/apache/maven/DefaultMaven.java Base (BASE)
+++ src/main/java/org/apache/maven/DefaultMaven.java Locally Modified (Based On LOCAL)
@@ -651,10 +651,12 @@
 
         try
         {
-            Proxy proxy = settings.getActiveProxy();
 
-            if ( proxy != null )
-            {
+            List proxies = settings.getProxies();
+            
+            for (int i = 0; i < proxies.size(); i++) {
+                Proxy proxy = (Proxy)proxies.get(i);
+                if (!proxy.isActive()) continue;
                 if ( proxy.getHost() == null )
                 {
                     throw new SettingsConfigurationException( "Proxy in settings.xml has no host" );
@@ -664,6 +666,12 @@
                                        proxy.getPassword(), proxy.getNonProxyHosts() );
             }
 
+//            Proxy proxy = settings.getActiveProxy();
+
+//            if ( proxy != null )
+//            {
+//            }
+
             for ( Iterator i = settings.getServers().iterator(); i.hasNext(); )
             {
                 Server server = (Server) i.next();