aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2016-01-14 10:14:42 +0100
committerJulien Lancelot <julien.lancelot@sonarsource.com>2016-01-14 10:14:42 +0100
commit877dfdc7ef5b0f6368f0da1693501d8e8f71a9c3 (patch)
tree4aaa5573de10dd5836cefd3ea688003b88c7a718 /server
parentd094d504fef670cf84524e9b984a737597fd324b (diff)
downloadsonarqube-877dfdc7ef5b0f6368f0da1693501d8e8f71a9c3.tar.gz
sonarqube-877dfdc7ef5b0f6368f0da1693501d8e8f71a9c3.zip
Fix quality flaws
Diffstat (limited to 'server')
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java2
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java21
2 files changed, 7 insertions, 16 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java
index 2b05482cabd..6e3558cb0b7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java
@@ -182,7 +182,7 @@ public class ProjectDataLoader {
}
}
- private void checkPermission(boolean preview, boolean hasScanPerm, boolean hasPreviewPerm) {
+ private static void checkPermission(boolean preview, boolean hasScanPerm, boolean hasPreviewPerm) {
if (!hasPreviewPerm && !hasScanPerm) {
throw new ForbiddenException(Messages.NO_PERMISSION);
}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java b/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java
index badc0fb4eb2..ccbcf912120 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java
@@ -67,15 +67,10 @@ public class BackendCleanup {
try {
statement = connection.createStatement();
for (String table : DatabaseVersion.TABLES) {
- try {
- statement.execute("TRUNCATE TABLE " + table.toLowerCase());
- // commit is useless on some databases
- connection.commit();
- } catch (Exception e) {
- throw new IllegalStateException("Fail to truncate db table " + table, e);
- }
+ statement.execute("TRUNCATE TABLE " + table.toLowerCase());
+ // commit is useless on some databases
+ connection.commit();
}
-
} catch (Exception e) {
throw new IllegalStateException("Fail to clear db", e);
} finally {
@@ -118,13 +113,9 @@ public class BackendCleanup {
statement = connection.createStatement();
// Clear inspection tables
for (String table : INSPECTION_TABLES) {
- try {
- statement.execute("TRUNCATE TABLE " + table.toLowerCase());
- // commit is useless on some databases
- connection.commit();
- } catch (Exception e) {
- throw new IllegalStateException("Fail to truncate db table " + table, e);
- }
+ statement.execute("TRUNCATE TABLE " + table.toLowerCase());
+ // commit is useless on some databases
+ connection.commit();
}
// Clear resource related tables