From 774f97551febd023e6f600da00bcc00512bd8404 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 2 Oct 2012 15:14:09 +0000 Subject: [PATCH] the id of ProxyConnectorRule is pattern AND type git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1392959 13f79535-47bb-0310-9956-ffa450edef68 --- .../DefaultProxyConnectorRuleAdmin.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java index 10f954a67..d05c65a2f 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java @@ -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 DefaultProxyConnectorRuleAdmin 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 DefaultProxyConnectorRuleAdmin 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 proxyConnectors = new ArrayList( proxyConnectorRule.getProxyConnectors().size() ); -- 2.39.5