From 00ba6944ea221c2638596c9a8f6c1cd75ed8a8d1 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Mon, 24 Mar 2014 14:44:24 +0100 Subject: [PATCH] Add check to verify that rule is not null when searching rule from active rule --- .../sonar/server/startup/RegisterNewProfiles.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewProfiles.java b/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewProfiles.java index 273bf4c6507..6e9d7ed3681 100644 --- a/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewProfiles.java +++ b/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewProfiles.java @@ -30,11 +30,7 @@ import org.slf4j.LoggerFactory; import org.sonar.api.database.DatabaseSession; import org.sonar.api.profiles.ProfileDefinition; import org.sonar.api.profiles.RulesProfile; -import org.sonar.api.rules.ActiveRule; -import org.sonar.api.rules.Rule; -import org.sonar.api.rules.RuleFinder; -import org.sonar.api.rules.RuleParam; -import org.sonar.api.rules.RuleQuery; +import org.sonar.api.rules.*; import org.sonar.api.utils.SonarException; import org.sonar.api.utils.TimeProfiler; import org.sonar.api.utils.ValidationMessages; @@ -45,11 +41,7 @@ import org.sonar.server.platform.PersistentSettings; import org.sonar.server.qualityprofile.ESActiveRule; import org.sonar.server.rule.RuleRegistration; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; public class RegisterNewProfiles { @@ -233,6 +225,9 @@ public class RegisterNewProfiles { rule = ruleFinder.find(RuleQuery.create().withRepositoryKey(rule.getRepositoryKey()).withConfigKey(rule.getConfigKey())); } } + if (rule == null) { + throw new IllegalStateException(String.format("Rule '%s' has not been found.", activeRule.getRule())); + } return rule; } -- 2.39.5