Fix some quality flaws

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/UpdateConflictResolver.java b/sonar-core/src/main/java/org/sonar/core/issue/db/UpdateConflictResolver.java
index 5ebe79bf908a1eff642c8f85f5c3ce61577b4df5..7a267ab8153959dc017b78b10ebce96314c7e5f8 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/issue/db/UpdateConflictResolver.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/db/UpdateConflictResolver.java
@@ -33,7 +33,7 @@ import java.util.Date;
  */
 class UpdateConflictResolver {
 
-  private final Logger LOG = LoggerFactory.getLogger(IssueStorage.class);
+  private static final Logger LOG = LoggerFactory.getLogger(IssueStorage.class);
 
   public void resolve(DefaultIssue issue, IssueMapper mapper) {
     LOG.debug("Resolve conflict on issue " + issue.key());

diff --git a/sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java b/sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java
index 8ac178283d0546259d21c549ed58ba25d768e132..af809dafd02d035f7d0fd5286fc75f34d210a88d 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java
+++ b/sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java
@@ -39,6 +39,7 @@ public class RubyUtils {
     // only static methods
   }
 
+  @CheckForNull
   public static List<String> toStrings(@Nullable Object o) {
     List<String> result = null;
     if (o != null) {