Fix bug on deprecated profiles

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java
index 2da2c6c23526ddcb62510b6733512d0832e61b61..b773d4076ec71fad60618faf0d8a430c33105a0f 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java
@@ -288,6 +288,6 @@ public class ActiveRule implements Cloneable {
    * @since 2.6
    */
   public boolean isEnabled() {
-    return getRule().isEnabled();
+    return getRule()!=null && getRule().isEnabled();
   }
 }

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 40ed1877b0711295ca97d8a7d544bac3c5b4638a..7d61dc8ccb80fd3bfacb19ea56af2059cc92823a 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/rules/DeprecatedProfiles.java
+++ b/sonar-server/src/main/java/org/sonar/server/rules/DeprecatedProfiles.java
@@ -103,7 +103,7 @@ public final class DeprecatedProfiles {
     for (int index = 0; index < repository.getProvidedProfiles().size(); index++) {
       RulesProfile deprecated = (RulesProfile) repository.getProvidedProfiles().get(index);
       DefaultProfileDefinition providedProfile = DefaultProfileDefinition.create(deprecated.getName(), repository.getLanguage().getKey());
-      for (ActiveRule deprecatedActiveRule : deprecated.getActiveRules()) {
+      for (ActiveRule deprecatedActiveRule : deprecated.getActiveRules(true)) {
         String repositoryKey = deprecatedActiveRule.getRepositoryKey();
         if (StringUtils.isBlank(repositoryKey)) {
           repositoryKey = getPluginKey(repository);
@@ -161,7 +161,7 @@ public final class DeprecatedProfiles {
     }
 
     public List<ActiveRule> getRules() {
-      return profile.getActiveRules();
+      return profile.getActiveRules(true);
     }
 
     public List<ActiveRule> getRulesByRepositoryKey(String repositoryKey) {