Fix failing hub tests

SeleniumHQ · Jul 13, 2018 · 2cbcd08 · 2cbcd08
1 parent 501da5f
commit 2cbcd08
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/java/server/src/org/openqa/grid/web/servlet/HubStatusServlet.java b/java/server/src/org/openqa/grid/web/servlet/HubStatusServlet.java
@@ -128,18 +128,16 @@ private Map<String, Object> getResponse(
     res.put(SUCCESS, true);
 
     try {
-      String configuration = request.getParameter(CONFIGURATION);
+      List<String> keysToReturn = null;
 
-      if (Strings.isNullOrEmpty(configuration)) {
-        configuration = "";
-        if (requestJSON.containsKey(CONFIGURATION)) {
+      String configuration = request.getParameter(CONFIGURATION);
+      if (!Strings.isNullOrEmpty(configuration)) {
+        keysToReturn = Splitter.on(",").omitEmptyStrings().splitToList(configuration);
+      } else if (requestJSON.get(CONFIGURATION) instanceof List) {
           //noinspection unchecked
-          configuration = requestJSON.get(CONFIGURATION).toString();
-        }
+          keysToReturn = (List<String>) requestJSON.get(CONFIGURATION);
       }
 
-      List<String> keysToReturn = Splitter.on(",").omitEmptyStrings().splitToList(configuration);
-
       GridRegistry registry = getRegistry();
       Map<String, Object> config = registry.getHub().getConfiguration().toJson();
       for (Map.Entry<String, Object> entry : config.entrySet()) {