diff options
| -rw-r--r-- | server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java | 2 | ||||
| -rw-r--r-- | sonar-application/src/main/assembly/conf/sonar.properties | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java index 416e4d4c8c3..cc4468b6431 100644 --- a/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java +++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java @@ -112,7 +112,7 @@ public class ProcessProperties { "-XX:+HeapDumpOnOutOfMemoryError"); defaults.put(ProcessProperties.SEARCH_JAVA_ADDITIONAL_OPTS, ""); - defaults.put(ProcessProperties.WEB_JAVA_OPTS, "-Xmx768m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true"); + defaults.put(ProcessProperties.WEB_JAVA_OPTS, "-Xmx768m -Xms256m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true"); defaults.put(ProcessProperties.WEB_JAVA_ADDITIONAL_OPTS, ""); defaults.put(ProcessProperties.JDBC_URL, "jdbc:h2:tcp://localhost:9092/sonar"); defaults.put(ProcessProperties.JDBC_MAX_ACTIVE, "60"); diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index 1377247eb7b..fec2dca7d41 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -90,7 +90,7 @@ # The HotSpot Server VM is recommended. The property -server should be added if server mode # is not enabled by default on your environment: http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server-class.html # -#sonar.web.javaOpts=-Xmx768m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError +#sonar.web.javaOpts=-Xmx768m -Xms256m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true # Same as previous property, but allows to not repeat all other settings like -Xmx #sonar.web.javaAdditionalOpts= |