Fix Quality flaws

diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDaemon.java b/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDaemon.java
index 5aa28229e300185af1d7e595ba56276dcbf1f8a4..08ae6bfa6e973ea041d3be0ed2f79471e0620845 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDaemon.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDaemon.java
@@ -94,6 +94,7 @@ public class NotificationDaemon implements Startable {
       executorService.awaitTermination(5, TimeUnit.SECONDS);
     } catch (InterruptedException e) {
       LOG.error("Error during stop of notification service", e);
+      Thread.currentThread().interrupt();
     }
     LOG.info("Notification service stopped");
   }

diff --git a/sonar-db/src/main/java/org/sonar/db/DbClient.java b/sonar-db/src/main/java/org/sonar/db/DbClient.java
index 35cedfc02a61ce710d4ffcabf811f61b6b1300c5..6a6f4d182cabc68e0ba95fa63e91fa4cbbf56810 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/DbClient.java
+++ b/sonar-db/src/main/java/org/sonar/db/DbClient.java
@@ -183,12 +183,6 @@ public class DbClient {
     groupDao = getDao(map, GroupDao.class);
     ruleDao = getDao(map, RuleDao.class);
     activeRuleDao = getDao(map, ActiveRuleDao.class);
-    doOnLoad(map);
-  }
-
-  // should be removed, but till used by sonar-server
-  protected void doOnLoad(Map<Class, Dao> daoByClass) {
-
   }
 
   public DbSession openSession(boolean batch) {

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultModuleFileSystem.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultModuleFileSystem.java
index 5b1e1844d0b241be6ef4202e1ede438d8a42423e..fc2c46cfb6fc895410fe81e61ec9dfbde0b4eb5f 100644 (file)
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultModuleFileSystem.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultModuleFileSystem.java
@@ -109,10 +109,6 @@ public class DefaultModuleFileSystem extends DefaultFileSystem {
     return !settings.hasKey(CoreProperties.ENCODING_PROPERTY);
   }
 
-  private static UnsupportedOperationException modificationNotPermitted() {
-    return new UnsupportedOperationException("Modifications of the file system are not permitted");
-  }
-
   @Override
   protected void doPreloadFiles() {
     if (!initialized) {