aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server/src/main/java
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2014-07-07 10:43:12 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2014-07-07 10:43:12 +0200
commit40a4c471d55c31c4f261be99599769f0d7d4e220 (patch)
tree5f67b90651ed7d60b5147c3cfbec3278f2c56d35 /sonar-server/src/main/java
parentd942133d4218549c6dc689bd6abb35e3a11d505a (diff)
downloadsonarqube-40a4c471d55c31c4f261be99599769f0d7d4e220.tar.gz
sonarqube-40a4c471d55c31c4f261be99599769f0d7d4e220.zip
SONAR-5007 fix update of param activation when no default value
Diffstat (limited to 'sonar-server/src/main/java')
-rw-r--r--sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java
index 81c470690ba..e779be00911 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java
@@ -214,7 +214,10 @@ class RuleActivatorContext {
}
for (Map.Entry<String, String> changeParam : change.getParameters().entrySet()) {
ActiveRuleParamDto param = activeRuleParams.get(changeParam.getKey());
- if (param != null && !StringUtils.equals(changeParam.getValue(), param.getValue())) {
+ if (changeParam.getValue()==null && param != null && param.getValue()!=null) {
+ return false;
+ }
+ if (changeParam.getValue()!=null && (param == null || !StringUtils.equals(changeParam.getValue(), param.getValue()))) {
return false;
}
}