Fixes unregistering of android/ios nodes from hub due too strict checking of result /wd/hub/status. Returning by node 200 response code (or 404 for RC) is enough for understanding that node is alive.

Author: alex-savchuk

Diff for: java/server/src/org/openqa/grid/internal/BaseRemoteProxy.java

@@ -507,11 +507,17 @@ public JSONObject getStatus() throws GridException {
       int code = response.getStatusLine().getStatusCode();
 
       if (code == 200) {
-        JSONObject status = extractObject(response);
+        JSONObject status = new JSONObject();
+        try {
+          status = extractObject(response);
+        } catch (Exception e) {
+          // ignored due it's not required from node to return anything. Just 200 code is enough.
+        }
         EntityUtils.consume(response.getEntity());
         return status;
       } else if (code == 404) { // selenium RC case
         JSONObject status = new JSONObject();
+        EntityUtils.consume(response.getEntity());
         return status;
       } else {
         EntityUtils.consume(response.getEntity());

Diff for: java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java

@@ -125,11 +125,7 @@ public HtmlRenderer getHtmlRender() {
 
   public boolean isAlive() {
     try {
-      JSONObject o = getStatus();
-      return o.getString("state").equals("success");
-    } catch (JSONException e) {
-      // suppose that if json exception is raised
-      // it's selenium RC case
+      getStatus();
       return true;
     } catch (Exception e) {
       log.warning("Failed to check status of node: " + e.getMessage());