diff options
Diffstat (limited to 'archiva-modules')
1 files 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<ProxyConnectorConfiguration> proxyConnectors = new ArrayList<ProxyConnectorConfiguration>( proxyConnectorRule.getProxyConnectors().size() ); |