From 752ee3a8f130b58a5b36a76144d1752fe0bd22a0 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Wed, 12 Jun 2013 18:47:48 +0200 Subject: [PATCH] Fix some quality flaws --- .../java/org/sonar/core/issue/db/UpdateConflictResolver.java | 2 +- sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 5ebe79bf908..7a267ab8153 100644 --- 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 8ac178283d0..af809dafd02 100644 --- 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 toStrings(@Nullable Object o) { List result = null; if (o != null) { -- 2.39.5