When registering rule on startup, take a rule int id instead of a rule when removing...

diff --git a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java b/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java
index c3e82d9a73ca27cefe411931689dcd0484f5561a..50578dd53c98638aaa91e12c7629f45ac65030a1 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java
+++ b/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java
@@ -102,7 +102,7 @@ public class ProfilesManager extends BaseDao {
   /**
    * Deactivate all active rules from profiles using a rule, then remove then.
    */
-  public void removeActivatedRules(Integer ruleId) {
+  public void removeActivatedRules(int ruleId) {
     List<ActiveRule> activeRules = getSession().createQuery("FROM " + ActiveRule.class.getSimpleName() + " WHERE rule.id=:ruleId").setParameter("ruleId", ruleId).getResultList();
     List<ActiveRule> activeRulesToRemove = Lists.newArrayList();
 

diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterRules.java b/sonar-server/src/main/java/org/sonar/server/startup/RegisterRules.java
index df0e5fbaf012a384e818ea04118eb2b48a7097a5..523ac4cba9c39786adea13ba72a482aa02ade096 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/startup/RegisterRules.java
+++ b/sonar-server/src/main/java/org/sonar/server/startup/RegisterRules.java
@@ -271,7 +271,7 @@ public final class RegisterRules {
     if (!rule.getStatus().equals(Rule.STATUS_REMOVED)) {
       LOG.info("Removing rule " + rule.ruleKey());
       profilesManager.removeActivatedRules(rule.getId());
-      rule = session.reattach(Rule.class, rule.getId());
+      rule = session.reattach(Rule.class, rule.getId().intValue());
       rule.setStatus(Rule.STATUS_REMOVED);
       rule.setUpdatedAt(new Date());
       session.save(rule);