Fix the build

grigaman · Sep 20, 2018 · 2ddb978 · 2ddb978
1 parent 1664eeb
commit 2ddb978
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/java/server/src/org/openqa/selenium/grid/config/ConcatenatingConfig.java b/java/server/src/org/openqa/selenium/grid/config/ConcatenatingConfig.java
@@ -31,7 +31,7 @@ public class ConcatenatingConfig implements Config {
   private final Map<String, String> values;
 
   public ConcatenatingConfig(String prefix, char separator, Map<?, ?> values) {
-    this.prefix = prefix == null ? "" : prefix + separator;
+    this.prefix = prefix == null || "".equals(prefix) ? "" : (prefix + separator);
     this.separator = separator;
 
     this.values = Objects.requireNonNull(values).entrySet().stream()

diff --git a/java/server/test/org/openqa/selenium/grid/config/ConfigTest.java b/java/server/test/org/openqa/selenium/grid/config/ConfigTest.java
@@ -47,7 +47,7 @@ public void shouldReturnEmptyIfConfigValueIsMissing() {
   public void shouldReadSystemProperties() {
     Config config = new CompoundConfig(
         new MapConfig(ImmutableMap.of()),
-        new ConcatenatingConfig("", ',', System.getProperties()));
+        new ConcatenatingConfig("", '.', System.getProperties()));
 
     assertEquals(System.getProperty("user.home"), config.get("user", "home").get());
   }