svn commit: r1392959 - /archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java

[olamy]

Author: olamy
Date: Tue Oct  2 15:14:09 2012
New Revision: 1392959

URL: http://svn.apache.org/viewvc?rev=1392959&view=rev
Log:
the id of ProxyConnectorRule is pattern AND type

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java?rev=1392959&r1=1392958&r2=1392959&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java
 Tue Oct  2 15:14:09 2012
@@ -41,7 +41,7 @@ import java.util.List;
  * @author Olivier Lamy
  * @since 1.4-M3
  */
-@Service ( "proxyConnectorRuleAdmin#default" )
+@Service ("proxyConnectorRuleAdmin#default")
 public class DefaultProxyConnectorRuleAdmin
     extends AbstractRepositoryAdmin
     implements ProxyConnectorRuleAdmin
@@ -125,7 +125,9 @@ public class DefaultProxyConnectorRuleAd
 
         for ( ProxyConnectorRuleConfiguration proxyConnectorRuleConfiguration 
: configuration.getProxyConnectorRuleConfigurations() )
         {
-            if ( StringUtils.equals( 
proxyConnectorRuleConfiguration.getPattern(), proxyConnectorRule.getPattern() ) 
)
+            if ( StringUtils.equals( 
proxyConnectorRuleConfiguration.getPattern(), proxyConnectorRule.getPattern() )
+                && StringUtils.equals( 
proxyConnectorRuleConfiguration.getRuleType(),
+                                       
proxyConnectorRule.getProxyConnectorRuleType().toString() ) )
             {
                 toSave = true;
             }
@@ -150,7 +152,9 @@ public class DefaultProxyConnectorRuleAd
 
         for ( ProxyConnectorRuleConfiguration proxyConnectorRuleConfiguration 
: configuration.getProxyConnectorRuleConfigurations() )
         {
-            if ( StringUtils.equals( 
proxyConnectorRuleConfiguration.getPattern(), proxyConnectorRule.getPattern() ) 
)
+            if ( StringUtils.equals( 
proxyConnectorRuleConfiguration.getPattern(), proxyConnectorRule.getPattern() )
+                && StringUtils.equals( 
proxyConnectorRuleConfiguration.getRuleType(),
+                                       
proxyConnectorRule.getProxyConnectorRuleType().toString() ) )
             {
                 List<ProxyConnectorConfiguration> proxyConnectors =
                     new ArrayList<ProxyConnectorConfiguration>( 
proxyConnectorRule.getProxyConnectors().size() );