diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-07-23 14:42:58 +0200 |
|---|---|---|
| committer | Stephane Gamard <stephane.gamard@searchbox.com> | 2014-07-23 15:34:08 +0200 |
| commit | 9c29050c2d83a4cf28bda17c9ba08c420338d4e6 (patch) | |
| tree | 54f29e122cbb080698f7dd65148876df72930b1c /server/sonar-search | |
| parent | 5932476ce437e867b0d295c9ebd522219d76b924 (diff) | |
| download | sonarqube-9c29050c2d83a4cf28bda17c9ba08c420338d4e6.tar.gz sonarqube-9c29050c2d83a4cf28bda17c9ba08c420338d4e6.zip | |
SONAR-4898 improve management of sonar.path.* properties
Diffstat (limited to 'server/sonar-search')
| -rw-r--r-- | server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java | 2 | ||||
| -rw-r--r-- | server/sonar-search/src/test/java/org/sonar/search/ElasticSearchTest.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java b/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java index dc1aae83833..83b11cbc08c 100644 --- a/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java +++ b/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java @@ -164,7 +164,7 @@ public class ElasticSearch extends Process { try { Thread.sleep(100); } catch (InterruptedException e) { - ; + } } } diff --git a/server/sonar-search/src/test/java/org/sonar/search/ElasticSearchTest.java b/server/sonar-search/src/test/java/org/sonar/search/ElasticSearchTest.java index 62950bee734..2eedf391b80 100644 --- a/server/sonar-search/src/test/java/org/sonar/search/ElasticSearchTest.java +++ b/server/sonar-search/src/test/java/org/sonar/search/ElasticSearchTest.java @@ -85,6 +85,7 @@ public class ElasticSearchTest { properties.setProperty(Process.NAME_PROPERTY, "ES"); properties.setProperty("sonar.path.data", tempDirectory.getAbsolutePath()); properties.setProperty(ElasticSearch.ES_PORT_PROPERTY, Integer.toString(freeESPort)); + properties.setProperty(ElasticSearch.ES_CLUSTER_PROPERTY, "sonarqube"); elasticSearch = new ElasticSearch(new Props(properties)); new Thread(new Runnable() { |