Prevent dup subscription header on re-receive.

Author: gmallard

lib/stomp/connection.rb

@@ -336,12 +336,14 @@ def unreceive(message, options = {})
       options = { :dead_letter_queue => "/queue/DLQ", :max_redeliveries => 6 }.merge(options)
       # Lets make sure all keys are symbols
       message.headers = message.headers.symbolize_keys
-
       retry_count = message.headers[:retry_count].to_i || 0
       message.headers[:retry_count] = retry_count + 1
       transaction_id = "transaction-#{message.headers[:'message-id']}-#{retry_count}"
       message_id = message.headers.delete(:'message-id')
 
+      # Prevent duplicate 'subscription' headers on subsequent receives
+      message.headers.delete(:subscription) if message.headers[:subscription]
+
       begin
         self.begin transaction_id
 

test/test_client.rb

@@ -616,7 +616,6 @@ def test_jruby_presence
 
   # test max redeliveries is not broken (6c2c1c1)
   def test_max_redeliveries
-    return if ENV['STOMP_RABBIT'] || (ENV['STOMP_APOLLO'] && ENV['STOMP_TEST11p'])
     @client.close
     rdmsg = "To Be Redelivered"
     dest = make_destination