summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/sonar-search/src/main/java/org/sonar/search/SearchServer.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
index 14d28abd45c..d93136aad8f 100644
--- a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
+++ b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
@@ -224,10 +224,12 @@ public class SearchServer extends MonitoredProcess {
}
private File esHomeDir() {
- if (!props.contains(SONAR_PATH_HOME)) {
+ String homeDir = props.of(SONAR_PATH_HOME);
+ if (StringUtils.isEmpty(homeDir)) {
throw new IllegalStateException("property 'sonar.path.home' is required");
+ } else {
+ return new File(homeDir);
}
- return new File(props.of(SONAR_PATH_HOME));
}
private File esDataDir() {