Fix quality flaws

2 files changed, 2 insertions, 4 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java
index 3d2dded5fbf..f1bba567579 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java
@@ -121,7 +121,6 @@ public class IssueService implements ServerComponent {
    * Never return null, but an empty list if the issue does not exist.
    * No security check is done since it should already have been done to get the issue
    */
-  // TODO remove userSession parameter ?
   public List<Transition> listTransitions(@Nullable Issue issue, UserSession userSession) {
     if (issue == null) {
       return Collections.emptyList();
diff --git a/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java b/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java
index 4939964bf25..ddcd033de8d 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java
@@ -53,11 +53,10 @@ public class DefaultRuleFinder implements RuleFinder {
   @CheckForNull
   public org.sonar.api.rules.Rule findById(int ruleId) {
     Rule rule = index.getById(ruleId);
-    if (rule.status() != RuleStatus.REMOVED) {
+    if (rule != null && rule.status() != RuleStatus.REMOVED) {
       return toRule(rule);
-    } else {
-      return null;
     }
+    return null;
   }
 
   @CheckForNull