From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Wed, 7 Sep 2016 11:27:26 +0000 (+0200)
Subject: Fix Quality flaws
X-Git-Tag: 6.1-RC1~193
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f7c2985b3edabf83678f8d32eb7a525f990d0f9a;p=sonarqube.git

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 5aa28229e30..08ae6bfa6e9 100644
--- 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 35cedfc02a6..6a6f4d182ca 100644
--- 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 5b1e1844d0b..fc2c46cfb6f 100644
--- 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) {