1 files changed, 16 insertions, 13 deletions
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
index bf7c0f7dc..f37faf4b1 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
@@ -282,22 +282,25 @@
         java.util.Map<String, java.util.List<ProxyConnectorConfiguration>> proxyConnectorMap =
             new java.util.HashMap<String, java.util.List<ProxyConnectorConfiguration>>();
 
-        java.util.Iterator<ProxyConnectorConfiguration> it = proxyConnectors.iterator();
-        while ( it.hasNext() )
+        if( proxyConnectors != null )
         {
-            ProxyConnectorConfiguration proxyConfig = it.next();
-            String key = proxyConfig.getSourceRepoId();
-
-            java.util.List<ProxyConnectorConfiguration> connectors = proxyConnectorMap.get( key );
-            if ( connectors == null )
+            java.util.Iterator<ProxyConnectorConfiguration> it = proxyConnectors.iterator();
+            while ( it.hasNext() )
             {
-                connectors = new java.util.ArrayList<ProxyConnectorConfiguration>();
-                proxyConnectorMap.put( key, connectors );
-            }
+                ProxyConnectorConfiguration proxyConfig = it.next();
+                String key = proxyConfig.getSourceRepoId();
+
+                java.util.List<ProxyConnectorConfiguration> connectors = proxyConnectorMap.get( key );
+                if ( connectors == null )
+                {
+                    connectors = new java.util.ArrayList<ProxyConnectorConfiguration>();
+                    proxyConnectorMap.put( key, connectors );
+                }
 
-            connectors.add( proxyConfig );
-            java.util.Collections.sort( connectors,
-                org.apache.maven.archiva.configuration.functors.ProxyConnectorConfigurationOrderComparator.getInstance() );
+                connectors.add( proxyConfig );
+                java.util.Collections.sort( connectors,
+                    org.apache.maven.archiva.configuration.functors.ProxyConnectorConfigurationOrderComparator.getInstance() );
+            }
         }
 
         return proxyConnectorMap;