SONAR-4898 few improvements

3 files changed, 1 insertions, 18 deletions

diff --git a/server/sonar-server-app/src/main/java/org/sonar/server/app/Env.java b/server/sonar-server-app/src/main/java/org/sonar/server/app/Env.java
index 885fbbad7b1..a9b9f7c278c 100644
--- a/server/sonar-server-app/src/main/java/org/sonar/server/app/Env.java
+++ b/server/sonar-server-app/src/main/java/org/sonar/server/app/Env.java
@@ -23,7 +23,6 @@ import org.apache.commons.io.FileUtils;
 import org.sonar.process.Props;
 
 import java.io.File;
-import java.io.IOException;
 
 class Env {
 
@@ -51,19 +50,4 @@ class Env {
     dir.mkdirs();
     return dir;
   }
-
-  /**
-   * This check is required in order to provide more meaningful message than JRuby - see SONAR-2715
-   */
-  void verifyWritableTempDir() {
-    File file = null;
-    try {
-      file = File.createTempFile("sonarqube-check", "tmp");
-    } catch (IOException e) {
-      throw new IllegalStateException("Unable to create file in temporary directory, please check existence " +
-        "and permissions of: " + FileUtils.getTempDirectory(), e);
-    } finally {
-      FileUtils.deleteQuietly(file);
-    }
-  }
 }
diff --git a/server/sonar-server-app/src/main/java/org/sonar/server/app/ServerProcess.java b/server/sonar-server-app/src/main/java/org/sonar/server/app/ServerProcess.java
index 287176a828d..9006705365e 100644
--- a/server/sonar-server-app/src/main/java/org/sonar/server/app/ServerProcess.java
+++ b/server/sonar-server-app/src/main/java/org/sonar/server/app/ServerProcess.java
@@ -27,7 +27,6 @@ public class ServerProcess extends org.sonar.process.Process {
     super(args);
     Logging.init();
     Env env = new Env(props);
-    env.verifyWritableTempDir();
     this.tomcat = new EmbeddedTomcat(env);
   }
 
diff --git a/server/sonar-server-app/src/main/java/org/sonar/server/app/Webapp.java b/server/sonar-server-app/src/main/java/org/sonar/server/app/Webapp.java
index e20500f15bd..9f98faf2ec6 100644
--- a/server/sonar-server-app/src/main/java/org/sonar/server/app/Webapp.java
+++ b/server/sonar-server-app/src/main/java/org/sonar/server/app/Webapp.java
@@ -40,7 +40,7 @@ class Webapp {
       context.setConfigFile(env.file("web/META-INF/context.xml").toURI().toURL());
       context.addParameter(PROPERTY_LOG_PROFILING_LEVEL, props.of(PROPERTY_LOG_PROFILING_LEVEL, "NONE"));
       context.addParameter(PROPERTY_LOG_CONSOLE, props.of(PROPERTY_LOG_CONSOLE, "false"));
-      for (Map.Entry<Object, Object> entry : props.properties().entrySet()) {
+      for (Map.Entry<Object, Object> entry : props.cryptedProperties().entrySet()) {
         String key = entry.getKey().toString();
         if (key.startsWith("sonar.")) {
           context.addParameter(key, entry.getValue().toString());