Fixing SessionId from json converter to better handle the case of nul…

…l sessionId
SeleniumHQ · Oct 5, 2014 · 4114a07 · 4114a07
1 parent 65f9399
commit 4114a07
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/java/client/src/org/openqa/selenium/remote/JsonToBeanConverter.java b/java/client/src/org/openqa/selenium/remote/JsonToBeanConverter.java
@@ -95,7 +95,7 @@ private <T> T convert(Class<T> clazz, Object text, int depth) {
       JsonObject json = new JsonParser().parse((String) text).getAsJsonObject();
 
       SessionId sessionId = null;
-      if (json.has("sessionId")) {
+      if (json.has("sessionId") && !json.get("sessionId").isJsonNull()) {
         sessionId = convert(SessionId.class, json.get("sessionId"), depth + 1);
       }