SONAR-3306 minor improvement on logs

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/CheckSemaphore.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/CheckSemaphore.java
index c3f7a6086e4f6f304d43ef6f2547eaeee640002d..7ea91681fe301eda9d6bb1df2c33312ece976cdf 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/CheckSemaphore.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/CheckSemaphore.java
@@ -70,7 +70,7 @@ public class CheckSemaphore {
   }
 
   private Lock acquire() {
-    LOG.debug("Acquire semaphore on project : {}", getProject());
+    LOG.debug("Acquire semaphore on project : {}, with key {}", getProject(), getSemaphoreKey());
     if (!isForceAnalyseActivated()) {
       return semaphoreDao.acquire(getSemaphoreKey());
     } else {
@@ -79,7 +79,7 @@ public class CheckSemaphore {
   }
 
   private void release() {
-    LOG.debug("Release semaphore on project : {}", getProject());
+    LOG.debug("Release semaphore on project : {}, with key {}", getProject(), getSemaphoreKey());
     semaphoreDao.release(getSemaphoreKey());
   }
 

diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/SemaphoreDaoTest.java b/sonar-core/src/test/java/org/sonar/core/persistence/SemaphoreDaoTest.java
index 6458060cb3a62be4b3ba64b22f613c496a083399..4aae08020825812422224e78a188939c0413d8a7 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/persistence/SemaphoreDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/persistence/SemaphoreDaoTest.java
@@ -248,7 +248,6 @@ public class SemaphoreDaoTest extends AbstractDaoTestCase {
     ResultSet rs = null;
     try {
       connection = getConnection();
-      rs = null;
       statement = connection.prepareStatement("select current_timestamp");
       rs = statement.executeQuery();
       if (rs.next()) {