aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-server-common
diff options
context:
space:
mode:
authorDuarte Meneses <duarte.meneses@sonarsource.com>2018-07-19 11:42:54 +0200
committerSonarTech <sonartech@sonarsource.com>2018-07-19 20:21:26 +0200
commite51cb49945d4f3a1d39f74234de49be8ca925fff (patch)
tree6dc4181f26a0f4895874e1c6fb1f83669a213839 /server/sonar-server-common
parent35428013060d9fb81e7119426e9bfe9858521d4a (diff)
downloadsonarqube-e51cb49945d4f3a1d39f74234de49be8ca925fff.tar.gz
sonarqube-e51cb49945d4f3a1d39f74234de49be8ca925fff.zip
Revert "SONAR-10541, SONAR-10331 Drop compatibility mode and clean plugin classloader"
This reverts commit 4dcb5245f1147048d122ff2d335a6b5b7364c565.
Diffstat (limited to 'server/sonar-server-common')
-rw-r--r--server/sonar-server-common/src/main/java/org/sonar/server/platform/ServerFileSystemImpl.java16
1 files changed, 3 insertions, 13 deletions
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/platform/ServerFileSystemImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/platform/ServerFileSystemImpl.java
index d596044e8e3..9818d98584f 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/platform/ServerFileSystemImpl.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/platform/ServerFileSystemImpl.java
@@ -20,8 +20,6 @@
package org.sonar.server.platform;
import java.io.File;
-import java.io.IOException;
-import org.apache.commons.io.FileUtils;
import org.picocontainer.Startable;
import org.sonar.api.config.Configuration;
import org.sonar.api.utils.log.Logger;
@@ -41,9 +39,9 @@ public class ServerFileSystemImpl implements ServerFileSystem, org.sonar.api.pla
private final File uninstallDir;
public ServerFileSystemImpl(Configuration config) {
- this.homeDir = createDir(new File(config.get(PATH_HOME.getKey()).get()));
- this.tempDir = createDir(new File(config.get(PATH_TEMP.getKey()).get()));
- File dataDir = createDir(new File(config.get(PATH_DATA.getKey()).get()));
+ this.homeDir = new File(config.get(PATH_HOME.getKey()).get());
+ this.tempDir = new File(config.get(PATH_TEMP.getKey()).get());
+ File dataDir = new File(config.get(PATH_DATA.getKey()).get());
this.deployDir = new File(dataDir, "web/deploy");
this.uninstallDir = new File(getTempDir(), "uninstalled-plugins");
}
@@ -93,12 +91,4 @@ public class ServerFileSystemImpl implements ServerFileSystem, org.sonar.api.pla
return uninstallDir;
}
- private static File createDir(File dir) {
- try {
- FileUtils.forceMkdir(dir);
- return dir;
- } catch (IOException e) {
- throw new IllegalStateException("Fail to create directory " + dir, e);
- }
- }
}