svn commit: r1237625 - /archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java

[ol...@apache.org]

Author: olamy
Date: Mon Jan 30 12:43:53 2012
New Revision: 1237625

URL: http://svn.apache.org/viewvc?rev=1237625&view=rev
Log:
fix false warning on missing policy

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java?rev=1237625&r1=1237624&r2=1237625&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java Mon Jan 30 12:43:53 2012
@@ -25,6 +25,7 @@ import org.apache.archiva.configuration.
 import org.apache.archiva.policies.AbstractUpdatePolicy;
 import org.apache.archiva.policies.CachedFailuresPolicy;
 import org.apache.archiva.policies.ChecksumPolicy;
+import org.apache.archiva.policies.DownloadErrorPolicy;
 import org.apache.archiva.policies.Policy;
 import org.apache.archiva.policies.PostDownloadPolicy;
 import org.apache.archiva.policies.PreDownloadPolicy;
@@ -125,6 +126,14 @@ public class DefaultArchivaConfiguration
 
     /**
      * see #initialize
+     *
+     * @todo these don't strictly belong in here
+     */
+    private Map<String, DownloadErrorPolicy> downloadErrorPolicies;
+
+
+    /**
+     * see #initialize
      * default-value="${user.home}/.m2/archiva.xml"
      */
     private String userConfigFilename = "${user.home}/.m2/archiva.xml";
@@ -386,6 +395,12 @@ public class DefaultArchivaConfiguration
             return policy;
         }
 
+        policy = downloadErrorPolicies.get( policyId );
+        if ( policy != null )
+        {
+            return policy;
+        }
+
         return null;
     }
 
@@ -403,7 +418,8 @@ public class DefaultArchivaConfiguration
             return false;
         }
 
-        return ( prePolicies.containsKey( policyId ) || postPolicies.containsKey( policyId ) );
+        return ( prePolicies.containsKey( policyId ) || postPolicies.containsKey( policyId )
+            || downloadErrorPolicies.containsKey( policyId ) );
     }
 
     private Registry readDefaultConfiguration()
@@ -659,6 +675,7 @@ public class DefaultArchivaConfiguration
 
         this.postPolicies = componentContainer.buildMapWithRole( PostDownloadPolicy.class );
         this.prePolicies = componentContainer.buildMapWithRole( PreDownloadPolicy.class );
+        this.downloadErrorPolicies = componentContainer.buildMapWithRole( DownloadErrorPolicy.class );
         // Resolve expressions in the userConfigFilename and altConfigFilename
         try
         {