Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0A031200D30 for ; Mon, 30 Oct 2017 20:23:53 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 08688160BF8; Mon, 30 Oct 2017 19:23:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4DFA2160BE4 for ; Mon, 30 Oct 2017 20:23:52 +0100 (CET) Received: (qmail 36577 invoked by uid 500); 30 Oct 2017 19:23:51 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 36568 invoked by uid 99); 30 Oct 2017 19:23:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Oct 2017 19:23:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 89BB6DF9AE; Mon, 30 Oct 2017 19:23:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: eallen@apache.org To: commits@qpid.apache.org Date: Mon, 30 Oct 2017 19:23:48 -0000 Message-Id: In-Reply-To: <980b3510bbd34cb6ba73fb32c2a9eb2d@git.apache.org> References: <980b3510bbd34cb6ba73fb32c2a9eb2d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] qpid-dispatch git commit: DISPATCH-861 For latest rhea.js move the reply_to:, to:, and correlation_id: fields out of message properties archived-at: Mon, 30 Oct 2017 19:23:53 -0000 DISPATCH-861 For latest rhea.js move the reply_to:, to:, and correlation_id: fields out of message properties Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/eaa8901c Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/eaa8901c Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/eaa8901c Branch: refs/heads/master Commit: eaa8901c7f64c6625a09bcd4900b28ae4888c705 Parents: fff3846 Author: Ernest Allen Authored: Mon Oct 30 15:23:08 2017 -0400 Committer: Ernest Allen Committed: Mon Oct 30 15:23:08 2017 -0400 ---------------------------------------------------------------------- console/stand-alone/plugin/js/qdrService.js | 20 ++++++++------------ console/stand-alone/plugin/lib/rhea-min.js | 12 ++++++------ 2 files changed, 14 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/eaa8901c/console/stand-alone/plugin/js/qdrService.js ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/js/qdrService.js b/console/stand-alone/plugin/js/qdrService.js index a9c15e7..62938d2 100644 --- a/console/stand-alone/plugin/js/qdrService.js +++ b/console/stand-alone/plugin/js/qdrService.js @@ -175,7 +175,7 @@ console.dump(e) }, // called by receiver's on('message') handler when a response arrives resolve: function(context) { - var correlationID = context.message.properties.correlation_id; + var correlationID = context.message.correlation_id; this._objects[correlationID].resolver(context.message.body, context); delete this._objects[correlationID]; }, @@ -803,8 +803,8 @@ console.dump(e) } } self.schema = response; + callback() }, ret.error); - callback() }, getNodeInfo: function(nodeName, entity, attrs, q, callback) { @@ -868,11 +868,9 @@ console.dump(e) } var msg = { body: attrs, - properties: { - to: fullAddr, - reply_to: self.receiver.remote.attach.source.address, - correlation_id: ret.id - }, + to: fullAddr, + reply_to: self.receiver.remote.attach.source.address, + correlation_id: ret.id, application_properties: application_properties } self.sender.send(msg); @@ -932,11 +930,9 @@ console.dump(e) self.sender.send({ body: body, - properties: { - to: to, - reply_to: self.receiver.remote.attach.source.address, - correlation_id: ret.id - }, + to: to, + reply_to: self.receiver.remote.attach.source.address, + correlation_id: ret.id, application_properties: application_properties }) } catch (e) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org