SONAR-1722: Don't allow to delete inherited profile

1 files changed, 1 insertions, 2 deletions

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 147e8132f70..1c6114ba386 100644
--- a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java
+++ b/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java
@@ -50,9 +50,8 @@ public class ProfilesManager extends BaseDao {
   }
 
   public void deleteProfile(int profileId) {
-    // TODO should support deletion of profile with children
     RulesProfile profile = getSession().getEntity(RulesProfile.class, profileId);
-    if (profile != null && !profile.getProvided()) {
+    if (profile != null && !profile.getProvided() && getChildren(profile).isEmpty()) {
       String hql = "UPDATE " + ResourceModel.class.getSimpleName() + " o SET o.rulesProfile=null WHERE o.rulesProfile=:rulesProfile";
       getSession().createQuery(hql).setParameter("rulesProfile", profile).executeUpdate();
       getSession().remove(profile);