Fixed conflict and some formatting of PR.

Author: victor73

lib/stomp.js

@@ -285,7 +285,8 @@ Stomp.prototype.connect = function() {
 // Takes a `Frame` object
 //
 Stomp.prototype.is_a_message = function(this_frame) {
-    return (this_frame.headers !== null && utils.really_defined(this_frame.headers['message-id']))
+    return (this_frame.headers !== null &&
+            utils.really_defined(this_frame.headers['message-id']))
 }
 
 // ## Stomp.should_run_message_callback
@@ -295,9 +296,13 @@ Stomp.prototype.is_a_message = function(this_frame) {
 // Takes a `Frame` object
 //
 Stomp.prototype.should_run_message_callback = function(this_frame) {
-    var subscription = this._subscribed_to[this_frame.headers.destination];
-    if (this_frame.headers.destination !== null && subscription) {
-        if (subscription.enabled && subscription.callback !== null && typeof(subscription.callback) == 'function') {
+    // The matching subscribed queue will be found in the subscription headers
+    // in the case of a reply-to temp queue with rabbitmq
+    var subscription = this._subscribed_to[this_frame.headers.destination] ||
+                       this._subscribed_to[this_frame.headers.subscription];
+    if (this_frame.headers.destination !== null && subscription !== null) {
+        if (subscription.enabled && subscription.callback !== null &&
+              typeof subscription.callback === 'function') {
             subscription.callback(this_frame.body, this_frame.headers);
         }
     }
@@ -401,6 +406,18 @@ Stomp.prototype.ack = function(message_id) {
 };
 
 
+//
+// ## Stomp.nack(message_id)
+//
+// **Deny received message**
+//
+// Takes a string representing the message id to nack
+//
+Stomp.prototype.nack = function(message_id) {
+    send_command(this, 'NACK', {'message-id': message_id});
+    this.log.debug('denied message: ' + message_id);
+};
+
 //
 // ## Stomp.nack(message_id)
 //