Merge in default

Steve Powell · Steve Powell · commit 2eaa1d4ca889 · 2012-05-17T16:56:06.000+01:00
diff --git a/src/com/rabbitmq/client/impl/ClientVersion.java.in b/src/com/rabbitmq/client/impl/ClientVersion.java.in
@@ -16,6 +16,10 @@
 
 package com.rabbitmq.client.impl;
 
+/**
+ * Publicly available Client Version information
+ */
 public class ClientVersion {
+    /** Full version string */
     public static final String VERSION = "@VERSION@";
 }
diff --git a/test/src/com/rabbitmq/client/test/BrokerTestCase.java b/test/src/com/rabbitmq/client/test/BrokerTestCase.java
@@ -169,7 +169,7 @@ protected void assertDelivered(String q, int count, boolean redelivered) throws
     for (int i = 0; i < count; i++) {
       r = basicGet(q);
       assertNotNull(r);
-      assertEquals(r.getEnvelope().isRedeliver(), redelivered);
+      assertEquals(redelivered, r.getEnvelope().isRedeliver());
     }
     assertNull(basicGet(q));
   }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,10 @@`
`16`	`16`
`17`	`17`	`package com.rabbitmq.client.impl;`
`18`	`18`
	`19`	`+/**`
	`20`	`+ * Publicly available Client Version information`
	`21`	`+ */`
`19`	`22`	`public class ClientVersion {`
	`23`	`+ /** Full version string */`
`20`	`24`	`public static final String VERSION = "@VERSION@";`
`21`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ protected void assertDelivered(String q, int count, boolean redelivered) throws`
`169`	`169`	`for (int i = 0; i < count; i++) {`
`170`	`170`	`r = basicGet(q);`
`171`	`171`	`assertNotNull(r);`
`172`		`- assertEquals(r.getEnvelope().isRedeliver(), redelivered);`
	`172`	`+ assertEquals(redelivered, r.getEnvelope().isRedeliver());`
`173`	`173`	`}`
`174`	`174`	`assertNull(basicGet(q));`
`175`	`175`	`}`