Merge branch 'stable'

rabbitmq · Mar 30, 2015 · 9909266 · 9909266
2 parents 0d36aab + 0c6b3d0
commit 9909266
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/rabbit_amqp1_0_incoming_link.erl b/src/rabbit_amqp1_0_incoming_link.erl
@@ -47,10 +47,10 @@ attach(#'v1_0.attach'{name = Name,
     case ensure_target(Target,
                        #incoming_link{
                          name        = Name,
-                         route_state = rabbit_routing_util:init_state() },
+                         route_state = rabbit_routing_util:init_state(),
+                         delivery_count = InitTransfer },
                        DCh) of
-        {ok, ServerTarget,
-         IncomingLink = #incoming_link{ delivery_count = InitTransfer }} ->
+        {ok, ServerTarget, IncomingLink} ->
             {_, _Outcomes} = rabbit_amqp1_0_link_util:outcomes(Source),
             %% Default is mixed
             Confirm =