From f7c2985b3edabf83678f8d32eb7a525f990d0f9a Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Wed, 7 Sep 2016 13:27:26 +0200 Subject: [PATCH] Fix Quality flaws --- .../org/sonar/server/notification/NotificationDaemon.java | 1 + sonar-db/src/main/java/org/sonar/db/DbClient.java | 6 ------ .../scanner/scan/filesystem/DefaultModuleFileSystem.java | 4 ---- 3 files changed, 1 insertion(+), 10 deletions(-) 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 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) { -- 2.39.5