Bug 900080 - Use e.message instead of e in onPacket errors, r=wlach
authorJonathan Griffin <jgriffin@mozilla.com>
Wed, 31 Jul 2013 10:55:44 -0700
changeset 153088 83e77ea05fd2e498b8db09b75df0f93257125bcc
parent 153087 f345e073fd4aabb810e057f2d05aa14035ddd88f
child 153089 33600eab273edec69da64c8fa97fb012279c5f78
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswlach
bugs900080
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 900080 - Use e.message instead of e in onPacket errors, r=wlach
testing/marionette/marionette-server.js
--- a/testing/marionette/marionette-server.js
+++ b/testing/marionette/marionette-server.js
@@ -163,17 +163,17 @@ MarionetteServerConnection.prototype = {
   onPacket: function MSC_onPacket(aPacket) {
     // Dispatch the request
     if (this.requestTypes && this.requestTypes[aPacket.type]) {
       try {
         this.requestTypes[aPacket.type].bind(this)(aPacket);
       } catch(e) {
         this.conn.send({ error: ("error occurred while processing '" +
                                  aPacket.type),
-                        message: e });
+                        message: e.message });
       }
     } else {
       this.conn.send({ error: "unrecognizedPacketType",
                        message: ('Marionette does not ' +
                                  'recognize the packet type "' +
                                  aPacket.type + '"') });
     }
   },