fix coding violations

2 files changed, 9 insertions, 8 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/rules/DeprecatedProfiles.java b/sonar-server/src/main/java/org/sonar/server/rules/DeprecatedProfiles.java
index 7d61dc8ccb8..9b7474ad594 100644
--- a/sonar-server/src/main/java/org/sonar/server/rules/DeprecatedProfiles.java
+++ b/sonar-server/src/main/java/org/sonar/server/rules/DeprecatedProfiles.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.server.rules;
 
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.Plugins;
 import org.sonar.api.checks.profiles.Check;
@@ -42,23 +43,23 @@ public final class DeprecatedProfiles {
   private CheckProfileProvider[] deprecatedCheckProfileProviders;
 
   public DeprecatedProfiles(Plugins plugins, RuleFinder ruleFinder, RulesRepository[] r, CheckProfile[] deprecatedCheckProfiles, CheckProfileProvider[] deprecatedCheckProfileProviders) {
-    this.deprecatedRepositories = r;
+    this.deprecatedRepositories = (RulesRepository[])ArrayUtils.clone(r);
     this.plugins = plugins;
     this.ruleFinder = ruleFinder;
-    this.deprecatedCheckProfiles = deprecatedCheckProfiles;
-    this.deprecatedCheckProfileProviders = deprecatedCheckProfileProviders;
+    this.deprecatedCheckProfiles = (CheckProfile[])ArrayUtils.clone(deprecatedCheckProfiles);
+    this.deprecatedCheckProfileProviders = (CheckProfileProvider[])ArrayUtils.clone(deprecatedCheckProfileProviders);
   }
 
   public DeprecatedProfiles(Plugins plugins, RuleFinder ruleFinder, RulesRepository[] r, CheckProfile[] deprecatedCheckProfiles) {
-    this.deprecatedRepositories = r;
+    this.deprecatedRepositories = (RulesRepository[])ArrayUtils.clone(r);
     this.plugins = plugins;
     this.ruleFinder = ruleFinder;
-    this.deprecatedCheckProfiles = deprecatedCheckProfiles;
+    this.deprecatedCheckProfiles = (CheckProfile[])ArrayUtils.clone(deprecatedCheckProfiles);
     this.deprecatedCheckProfileProviders = new CheckProfileProvider[0];
   }
 
   public DeprecatedProfiles(Plugins plugins, RuleFinder ruleFinder, RulesRepository[] r, CheckProfileProvider[] deprecatedCheckProfileProviders) {
-    this.deprecatedRepositories = r;
+    this.deprecatedRepositories = (RulesRepository[])ArrayUtils.clone(r);
     this.plugins = plugins;
     this.ruleFinder = ruleFinder;
     this.deprecatedCheckProfiles = new CheckProfile[0];
@@ -66,7 +67,7 @@ public final class DeprecatedProfiles {
   }
 
   public DeprecatedProfiles(Plugins plugins, RuleFinder ruleFinder, RulesRepository[] r) {
-    this.deprecatedRepositories = r;
+    this.deprecatedRepositories = (RulesRepository[])ArrayUtils.clone(r);
     this.plugins = plugins;
     this.ruleFinder = ruleFinder;
     this.deprecatedCheckProfiles = new CheckProfile[0];
diff --git a/sonar-server/src/main/java/org/sonar/server/ui/ViewProxy.java b/sonar-server/src/main/java/org/sonar/server/ui/ViewProxy.java
index d36e9562dab..c00437ac9dc 100644
--- a/sonar-server/src/main/java/org/sonar/server/ui/ViewProxy.java
+++ b/sonar-server/src/main/java/org/sonar/server/ui/ViewProxy.java
@@ -73,7 +73,7 @@ public class ViewProxy<V extends View> implements Comparable<ViewProxy> {
 
     DefaultTab defaultTabAnnotation = AnnotationUtils.getClassAnnotation(view, DefaultTab.class);
     if (defaultTabAnnotation != null) {
-      if (defaultTabAnnotation == null || defaultTabAnnotation.metrics().length == 0) {
+      if (defaultTabAnnotation.metrics().length == 0) {
         isDefaultTab = true;
         defaultForMetrics = new String[0];