Skip to content

Commit 3a18707

Browse files
author
Paul Jones
committed
Merge 1.7.2 master
2 parents c45948f + 2d7f5ad commit 3a18707

File tree

151 files changed

+1116
-688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+1116
-688
lines changed

LICENSE-MPL-RabbitMQ

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,11 +454,11 @@ EXHIBIT A -Mozilla Public License.
454454
are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
455455
Technologies LLC, and Rabbit Technologies Ltd.
456456

457-
Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
457+
Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
458458
Ltd. Portions created by Cohesive Financial Technologies LLC are
459-
Copyright (C) 2007-2009 Cohesive Financial Technologies
459+
Copyright (C) 2007-2010 Cohesive Financial Technologies
460460
LLC. Portions created by Rabbit Technologies Ltd are Copyright
461-
(C) 2007-2009 Rabbit Technologies Ltd.
461+
(C) 2007-2010 Rabbit Technologies Ltd.
462462

463463
All Rights Reserved.
464464

codegen.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
## are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
1919
## Technologies LLC, and Rabbit Technologies Ltd.
2020
##
21-
## Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
21+
## Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
2222
## Ltd. Portions created by Cohesive Financial Technologies LLC are
23-
## Copyright (C) 2007-2009 Cohesive Financial Technologies
23+
## Copyright (C) 2007-2010 Cohesive Financial Technologies
2424
## LLC. Portions created by Rabbit Technologies Ltd are Copyright
25-
## (C) 2007-2009 Rabbit Technologies Ltd.
25+
## (C) 2007-2010 Rabbit Technologies Ltd.
2626
##
2727
## All Rights Reserved.
2828
##
@@ -119,11 +119,11 @@ def printFileHeader():
119119
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
120120
// Technologies LLC, and Rabbit Technologies Ltd.
121121
//
122-
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
122+
// Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
123123
// Ltd. Portions created by Cohesive Financial Technologies LLC are
124-
// Copyright (C) 2007-2009 Cohesive Financial Technologies
124+
// Copyright (C) 2007-2010 Cohesive Financial Technologies
125125
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
126-
// (C) 2007-2009 Rabbit Technologies Ltd.
126+
// (C) 2007-2010 Rabbit Technologies Ltd.
127127
//
128128
// All Rights Reserved.
129129
//

src/com/rabbitmq/client/Address.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
1919
// Technologies LLC, and Rabbit Technologies Ltd.
2020
//
21-
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
21+
// Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
2222
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23-
// Copyright (C) 2007-2009 Cohesive Financial Technologies
23+
// Copyright (C) 2007-2010 Cohesive Financial Technologies
2424
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25-
// (C) 2007-2009 Rabbit Technologies Ltd.
25+
// (C) 2007-2010 Rabbit Technologies Ltd.
2626
//
2727
// All Rights Reserved.
2828
//

src/com/rabbitmq/client/AlreadyClosedException.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
1919
// Technologies LLC, and Rabbit Technologies Ltd.
2020
//
21-
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
21+
// Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
2222
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23-
// Copyright (C) 2007-2009 Cohesive Financial Technologies
23+
// Copyright (C) 2007-2010 Cohesive Financial Technologies
2424
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25-
// (C) 2007-2009 Rabbit Technologies Ltd.
25+
// (C) 2007-2010 Rabbit Technologies Ltd.
2626
//
2727
// All Rights Reserved.
2828
//

src/com/rabbitmq/client/BasicProperties.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
1919
// Technologies LLC, and Rabbit Technologies Ltd.
2020
//
21-
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
21+
// Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
2222
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23-
// Copyright (C) 2007-2009 Cohesive Financial Technologies
23+
// Copyright (C) 2007-2010 Cohesive Financial Technologies
2424
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25-
// (C) 2007-2009 Rabbit Technologies Ltd.
25+
// (C) 2007-2010 Rabbit Technologies Ltd.
2626
//
2727
// All Rights Reserved.
2828
//

src/com/rabbitmq/client/Channel.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
1919
// Technologies LLC, and Rabbit Technologies Ltd.
2020
//
21-
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
21+
// Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
2222
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23-
// Copyright (C) 2007-2009 Cohesive Financial Technologies
23+
// Copyright (C) 2007-2010 Cohesive Financial Technologies
2424
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25-
// (C) 2007-2009 Rabbit Technologies Ltd.
25+
// (C) 2007-2010 Rabbit Technologies Ltd.
2626
//
2727
// All Rights Reserved.
2828
//
@@ -61,7 +61,7 @@
6161
*
6262
*/
6363

64-
public interface Channel extends ShutdownNotifier{
64+
public interface Channel extends ShutdownNotifier {
6565
/**
6666
* Retrieve this channel's channel number.
6767
* @return the channel number
@@ -77,35 +77,35 @@ public interface Channel extends ShutdownNotifier{
7777
/**
7878
* Close this channel with the {@link com.rabbitmq.client.AMQP#REPLY_SUCCESS} close code
7979
* and message 'OK'.
80-
*
80+
*
8181
* @throws java.io.IOException if an error is encountered
8282
*/
8383
void close() throws IOException;
84-
84+
8585
/**
8686
* Close this channel.
87-
*
87+
*
8888
* @param closeCode the close code (See under "Reply Codes" in the AMQP specification)
8989
* @param closeMessage a message indicating the reason for closing the connection
9090
* @throws java.io.IOException if an error is encountered
9191
*/
9292
void close(int closeCode, String closeMessage) throws IOException;
93-
93+
9494
/**
9595
* Abort this channel with the {@link com.rabbitmq.client.AMQP#REPLY_SUCCESS} close code
9696
* and message 'OK'.
97-
*
97+
*
9898
* Forces the channel to close and waits for the close operation to complete.
9999
* Any encountered exceptions in the close operation are silently discarded.
100100
*/
101101
void abort() throws IOException;
102-
102+
103103
/**
104104
* Abort this channel.
105-
*
105+
*
106106
* Forces the channel to close and waits for the close operation to complete.
107107
* Any encountered exceptions in the close operation are silently discarded.
108-
*/
108+
*/
109109
void abort(int closeCode, String closeMessage) throws IOException;
110110

111111
/**
@@ -254,7 +254,7 @@ Exchange.DeclareOk exchangeDeclare(String exchange, String type, boolean passive
254254
* @throws java.io.IOException if an error is encountered
255255
*/
256256
Queue.DeclareOk queueDeclare(String queue) throws IOException;
257-
257+
258258
/**
259259
* Actively declare a non-exclusive, non-autodelete queue
260260
* The name of the new queue is held in the "queue" field of the {@link com.rabbitmq.client.AMQP.Queue.DeclareOk} result.
@@ -329,7 +329,7 @@ Queue.DeclareOk queueDeclare(String queue, boolean passive, boolean durable, boo
329329
* @throws java.io.IOException if an error is encountered
330330
*/
331331
Queue.BindOk queueBind(String queue, String exchange, String routingKey, Map<String, Object> arguments) throws IOException;
332-
332+
333333
/**
334334
* Unbinds a queue from an exchange, with no extra arguments.
335335
* @see com.rabbitmq.client.AMQP.Queue.Unbind
@@ -370,7 +370,7 @@ Queue.DeclareOk queueDeclare(String queue, boolean passive, boolean durable, boo
370370
* @see com.rabbitmq.client.AMQP.Queue.Purge
371371
* @see com.rabbitmq.client.AMQP.Queue.PurgeOk
372372
* @param queue the name of the queue
373-
* @param nowait whether to await completion of the purge
373+
* @param nowait whether to await completion of the purge
374374
* @return a purge-confirm method if the purge was executed succesfully
375375
* @throws java.io.IOException if an error is encountered
376376
*/

src/com/rabbitmq/client/Command.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
1919
// Technologies LLC, and Rabbit Technologies Ltd.
2020
//
21-
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
21+
// Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
2222
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23-
// Copyright (C) 2007-2009 Cohesive Financial Technologies
23+
// Copyright (C) 2007-2010 Cohesive Financial Technologies
2424
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25-
// (C) 2007-2009 Rabbit Technologies Ltd.
25+
// (C) 2007-2010 Rabbit Technologies Ltd.
2626
//
2727
// All Rights Reserved.
2828
//

src/com/rabbitmq/client/Connection.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
1919
// Technologies LLC, and Rabbit Technologies Ltd.
2020
//
21-
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
21+
// Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
2222
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23-
// Copyright (C) 2007-2009 Cohesive Financial Technologies
23+
// Copyright (C) 2007-2010 Cohesive Financial Technologies
2424
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25-
// (C) 2007-2009 Rabbit Technologies Ltd.
25+
// (C) 2007-2010 Rabbit Technologies Ltd.
2626
//
2727
// All Rights Reserved.
2828
//

src/com/rabbitmq/client/ConnectionFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
1919
// Technologies LLC, and Rabbit Technologies Ltd.
2020
//
21-
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
21+
// Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
2222
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23-
// Copyright (C) 2007-2009 Cohesive Financial Technologies
23+
// Copyright (C) 2007-2010 Cohesive Financial Technologies
2424
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25-
// (C) 2007-2009 Rabbit Technologies Ltd.
25+
// (C) 2007-2010 Rabbit Technologies Ltd.
2626
//
2727
// All Rights Reserved.
2828
//

src/com/rabbitmq/client/ConnectionParameters.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
1919
// Technologies LLC, and Rabbit Technologies Ltd.
2020
//
21-
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
21+
// Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
2222
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23-
// Copyright (C) 2007-2009 Cohesive Financial Technologies
23+
// Copyright (C) 2007-2010 Cohesive Financial Technologies
2424
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25-
// (C) 2007-2009 Rabbit Technologies Ltd.
25+
// (C) 2007-2010 Rabbit Technologies Ltd.
2626
//
2727
// All Rights Reserved.
2828
//

0 commit comments

Comments
 (0)