java: Fixing sessionId format in marionette connector

alchaochao · Mar 16, 2015 · 40377e4 · 40377e4
1 parent bb13f6d
commit 40377e4
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/java/client/src/org/openqa/selenium/firefox/internal/MarionetteConnection.java b/java/client/src/org/openqa/selenium/firefox/internal/MarionetteConnection.java
@@ -192,9 +192,8 @@ public Response execute(Command command) throws IOException {
     Map<String, Object> map = new JsonToBeanConverter().convert(Map.class, rawResponse);
     Response response;
     if (DriverCommand.NEW_SESSION.equals(command.getName())) {
-      // See https://bugzilla.mozilla.org/show_bug.cgi?id=1073732
-      response = new Response(new SessionId(new BeanToJsonConverter().convert(map.get("value"))));
-      response.setValue(Maps.newHashMap());
+      response = new Response(new SessionId(map.get("sessionId").toString()));
+      response.setValue(map.get("value"));
 
     } else {
       if (map.containsKey("error")) {
@@ -307,7 +306,7 @@ private String serializeCommand(Command command) {
     map.put("name", commandName);
     if (command.getSessionId() != null) {
       // See https://bugzilla.mozilla.org/show_bug.cgi?id=1073732
-      map.put("sessionId", new JsonToBeanConverter().convert(Map.class, command.getSessionId().toString()));
+      map.put("sessionId", command.getSessionId().toString());
     }
     map.put("parameters", params);