Merge remote-tracking branch 'origin/branch-5.0' into fix/merge-5.0

* origin/branch-5.0:
  SONAR-6130 fix deadlock during purge

Conflicts:
	sonar-core/src/main/java/org/sonar/core/purge/PurgeDao.java
	sonar-core/src/test/java/org/sonar/core/purge/PurgeDaoTest.java

1 files changed, 9 insertions, 6 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/purge/PurgeDao.java b/sonar-core/src/main/java/org/sonar/core/purge/PurgeDao.java
index 0e507c10dd6..6af3a526fcd 100644
--- a/sonar-core/src/main/java/org/sonar/core/purge/PurgeDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/purge/PurgeDao.java
@@ -32,10 +32,7 @@ import org.sonar.core.persistence.MyBatis;
 import org.sonar.core.resource.ResourceDao;
 import org.sonar.core.resource.ResourceDto;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 import static org.sonar.api.utils.DateUtils.dateToLong;
 
@@ -133,16 +130,22 @@ public class PurgeDao {
   }
 
   private void disableOrphanResources(final ResourceDto project, final SqlSession session, final PurgeMapper purgeMapper, final PurgeListener purgeListener) {
+    final List<IdUuidPair> componentIdUuids = new ArrayList<IdUuidPair>();
     session.select("org.sonar.core.purge.PurgeMapper.selectComponentIdUuidsToDisable", project.getId(), new ResultHandler() {
       @Override
       public void handleResult(ResultContext resultContext) {
         IdUuidPair componentIdUuid = (IdUuidPair) resultContext.getResultObject();
         if (componentIdUuid.getId() != null) {
-          disableResource(componentIdUuid, purgeMapper);
-          purgeListener.onComponentDisabling(componentIdUuid.getUuid());
+          componentIdUuids.add(componentIdUuid);
         }
       }
     });
+
+    for (IdUuidPair componentIdUuid : componentIdUuids) {
+      disableResource(componentIdUuid, purgeMapper);
+      purgeListener.onComponentDisabling(componentIdUuid.getUuid());
+    }
+
     session.commit();
   }