Fix NPE in CacheRuleFinder

diff --git a/sonar-core/src/main/java/org/sonar/core/components/CacheRuleFinder.java b/sonar-core/src/main/java/org/sonar/core/components/CacheRuleFinder.java
index f44461f5003c09341bee77c8009d5755ed39a5b2..ab1477ec8f6c5098e4c037b32540b74866bbac0a 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/components/CacheRuleFinder.java
+++ b/sonar-core/src/main/java/org/sonar/core/components/CacheRuleFinder.java
@@ -40,22 +40,24 @@ public final class CacheRuleFinder extends DefaultRuleFinder {
   @Override
   public Rule findById(int ruleId) {
     Rule rule = rulesById.get(ruleId);
-    if (rule==null) {
+    if (rule == null) {
       rule = doFindById(ruleId);
-      loadRepository(rule.getRepositoryKey());
+      if (rule != null) {
+        loadRepository(rule.getRepositoryKey());
+      }
     }
     return rule;
   }
 
   @Override
   public Rule findByKey(String repositoryKey, String ruleKey) {
-    Map<String,Rule> repository = loadRepository(repositoryKey);
+    Map<String, Rule> repository = loadRepository(repositoryKey);
     return repository.get(ruleKey);
   }
 
-  private Map<String,Rule> loadRepository(String repositoryKey) {
-    Map<String,Rule> repository = rulesByKey.get(repositoryKey);
-    if (repository==null) {
+  private Map<String, Rule> loadRepository(String repositoryKey) {
+    Map<String, Rule> repository = rulesByKey.get(repositoryKey);
+    if (repository == null) {
       repository = Maps.newHashMap();
       rulesByKey.put(repositoryKey, repository);
 

diff --git a/sonar-core/src/test/java/org/sonar/core/components/CacheRuleFinderTest.java b/sonar-core/src/test/java/org/sonar/core/components/CacheRuleFinderTest.java
index 33d76615ad078829fd1984fc0ab14c307d27025f..bbf0201ed4dd2f61c60a992e11e943205d2c1e1a 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/components/CacheRuleFinderTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/components/CacheRuleFinderTest.java
@@ -24,6 +24,7 @@ import org.sonar.api.rules.Rule;
 import org.sonar.api.rules.RuleFinder;
 import org.sonar.jpa.test.AbstractDbUnitTestCase;
 
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsNull.notNullValue;
 import static org.junit.Assert.assertThat;
@@ -41,6 +42,13 @@ public class CacheRuleFinderTest extends AbstractDbUnitTestCase {
     assertThat(finder.findById(3), notNullValue());
   }
 
+  @Test
+  public void shouldNotFailIfUnknownRuleId() {
+    setupData("shared");
+    RuleFinder finder = new CacheRuleFinder(getSessionFactory());
+    assertThat(finder.findById(33456816), nullValue());
+  }
+
   @Test
   public void shouldCacheFindByKey() {
     setupData("shared");