2 files changed, 13 insertions, 9 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeResult.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeResult.java
index 67d764ae042..d401c0ed598 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeResult.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeResult.java
@@ -22,14 +22,15 @@ package org.sonar.server.issue;
 
 import org.sonar.api.issue.Issue;
 
-import java.util.List;
+import java.util.Collection;
+import java.util.Set;
 
-import static com.google.common.collect.Lists.newArrayList;
+import static com.google.common.collect.Sets.newHashSet;
 
 public class IssueBulkChangeResult {
 
-  private List<Issue> issuesChanged = newArrayList();
-  private List<Issue> issuesNotChanged = newArrayList();
+  private Set<Issue> issuesChanged = newHashSet();
+  private Set<Issue> issuesNotChanged = newHashSet();
 
   public void addIssueChanged(Issue issue){
     this.issuesChanged.add(issue);
@@ -39,11 +40,11 @@ public class IssueBulkChangeResult {
     this.issuesNotChanged.add(issue);
   }
 
-  public List<Issue> issuesChanged() {
+  public Collection<Issue> issuesChanged() {
     return issuesChanged;
   }
 
-  public List<Issue> issuesNotChanged() {
+  public Collection<Issue> issuesNotChanged() {
     return issuesNotChanged;
   }
 }
diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java
index 586280b143e..cc23710a2c6 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java
@@ -35,6 +35,7 @@ import org.sonar.core.issue.db.IssueStorage;
 import org.sonar.server.user.UserSession;
 
 import javax.annotation.CheckForNull;
+
 import java.util.Date;
 import java.util.List;
 
@@ -75,12 +76,10 @@ public class IssueBulkChangeService {
 
     IssueChangeContext issueChangeContext = IssueChangeContext.createUser(new Date(), userSession.login());
     for (Issue issue : issues) {
+      ActionContext actionContext = new ActionContext(issue, issueChangeContext);
       for (Action action : bulkActions) {
         try {
-          ActionContext actionContext = new ActionContext(issue, issueChangeContext);
           if (action.supports(issue) && action.execute(issueBulkChangeQuery.properties(action.key()), actionContext)) {
-            issueStorage.save((DefaultIssue) issue);
-            issueNotifications.sendChanges((DefaultIssue) issue, issueChangeContext, issueQueryResult);
             result.addIssueChanged(issue);
           } else {
             result.addIssueNotChanged(issue);
@@ -90,6 +89,10 @@ public class IssueBulkChangeService {
           LOG.info("An error occur when trying to apply the action : "+ action.key() + " on issue : "+ issue.key() + ". This issue has been ignored.", e);
         }
       }
+      if (result.issuesChanged().contains(issue)) {
+        issueStorage.save((DefaultIssue) issue);
+        issueNotifications.sendChanges((DefaultIssue) issue, issueChangeContext, issueQueryResult);
+      }
     }
     return result;
   }