merge bug19250 into default

Author: Matthias Radestock

src/com/rabbitmq/client/Channel.java

@@ -320,7 +320,7 @@ Queue.DeclareOk queueDeclare(int ticket, String queue, boolean passive, boolean
     Queue.BindOk queueBind(int ticket, String queue, String exchange, String routingKey, Map<String, Object> arguments) throws IOException;
 
     /**
-     * Uninds a queue from an exchange, with no extra arguments.
+     * Unbinds a queue from an exchange, with no extra arguments.
      * @see com.rabbitmq.client.AMQP.Queue.Unbind
      * @see com.rabbitmq.client.AMQP.Queue.UnbindOk
      * @param ticket an access ticket for the appropriate realm

src/com/rabbitmq/client/impl/ChannelN.java

@@ -548,28 +548,28 @@ public Queue.BindOk queueBind(int ticket, String queue, String exchange,
     }
 
     /**
-     * Public API - Unbind a queue from an exchange.
-     * @see com.rabbitmq.client.AMQP.Queue.Unbind
-     * @see com.rabbitmq.client.AMQP.Queue.UnbindOk
+     * Public API - Bind a queue to an exchange, with no extra arguments.
+     * @see com.rabbitmq.client.AMQP.Queue.Bind
+     * @see com.rabbitmq.client.AMQP.Queue.BindOk
      */
-    public Queue.UnbindOk queueUnbind(int ticket, String queue, String exchange,
-                                  String routingKey, Map<String, Object> arguments)
+    public Queue.BindOk queueBind(int ticket, String queue, String exchange, String routingKey)
         throws IOException
     {
-        return (Queue.UnbindOk)
-            exnWrappingRpc(new Queue.Unbind(ticket, queue, exchange, routingKey,
-                                          arguments)).getMethod();
+        return queueBind(ticket, queue, exchange, routingKey, null);
     }
 
     /**
-     * Public API - Bind a queue to an exchange, with no extra arguments.
-     * @see com.rabbitmq.client.AMQP.Queue.Bind
-     * @see com.rabbitmq.client.AMQP.Queue.BindOk
+     * Public API - Unbind a queue from an exchange.
+     * @see com.rabbitmq.client.AMQP.Queue.Unbind
+     * @see com.rabbitmq.client.AMQP.Queue.UnbindOk
      */
-    public Queue.BindOk queueBind(int ticket, String queue, String exchange, String routingKey)
+    public Queue.UnbindOk queueUnbind(int ticket, String queue, String exchange, String routingKey,
+                                      Map<String, Object> arguments)
         throws IOException
     {
-        return queueBind(ticket, queue, exchange, routingKey, null);
+        return (Queue.UnbindOk)
+            exnWrappingRpc(new Queue.Unbind(ticket, queue, exchange, routingKey,
+                                            arguments)).getMethod();
     }
 
     /**