From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Wed, 30 Apr 2014 22:12:30 +0000 (+0200)
Subject: Do not accumulate already-processed actions in DbSession
X-Git-Tag: 4.4-RC1~1296
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0c76e846b02157c0a12d10d3f38b2f69772b4b94;p=sonarqube.git

Do not accumulate already-processed actions in DbSession
---

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DbSession.java b/sonar-core/src/main/java/org/sonar/core/persistence/DbSession.java
index 4b5dcaa89b0..fb07e588845 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DbSession.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DbSession.java
@@ -24,8 +24,6 @@ import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
 import org.apache.ibatis.session.SqlSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.sonar.core.cluster.QueueAction;
 import org.sonar.core.cluster.WorkQueue;
 
@@ -33,12 +31,9 @@ import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CountDownLatch;
 
 public class DbSession implements SqlSession {
 
-  private static final Logger LOG = LoggerFactory.getLogger(DbSession.class);
-
   private List<QueueAction> actions;
 
   private WorkQueue queue;
@@ -58,17 +53,19 @@ public class DbSession implements SqlSession {
   public void commit() {
     session.commit();
     queue.enqueue(actions);
+    actions.clear();
   }
 
   @Override
   public void commit(boolean force) {
     session.commit(force);
     queue.enqueue(actions);
+    actions.clear();
   }
 
   /**
-   *  We only care about the the commit section.
-   *  The rest is simply passed to its parent.
+   * We only care about the the commit section.
+   * The rest is simply passed to its parent.
    */
 
   @Override