Merge branch '4.x.x-stable'

acogoluegnes · acogoluegnes · commit 1641fc798291 · 2017-10-24T15:42:37.000+02:00
diff --git a/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java
@@ -121,7 +121,7 @@ public void configure(SSLEngine sslEngine) throws IOException {
     private void sendAndVerifyMessage(int size) throws Exception {
         CountDownLatch latch = new CountDownLatch(1);
         connection = basicGetBasicConsume(connection, QUEUE, latch, size);
-        boolean messagesReceived = latch.await(10, TimeUnit.SECONDS);
+        boolean messagesReceived = latch.await(20, TimeUnit.SECONDS);
         assertTrue("Message has not been received", messagesReceived);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public void configure(SSLEngine sslEngine) throws IOException {`
`121`	`121`	`private void sendAndVerifyMessage(int size) throws Exception {`
`122`	`122`	`CountDownLatch latch = new CountDownLatch(1);`
`123`	`123`	`connection = basicGetBasicConsume(connection, QUEUE, latch, size);`
`124`		`- boolean messagesReceived = latch.await(10, TimeUnit.SECONDS);`
	`124`	`+ boolean messagesReceived = latch.await(20, TimeUnit.SECONDS);`
`125`	`125`	`assertTrue("Message has not been received", messagesReceived);`
`126`	`126`	`}`
`127`	`127`