Skip to content

Commit b5a44f7

Browse files
committed
Merge branch '4.3.x-stable'
2 parents 72099bf + 5ad42b3 commit b5a44f7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/main/java/com/rabbitmq/client/impl/nio/NioLoop.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void run() {
6767
boolean writeRegistered = false;
6868

6969
try {
70-
while (true && !Thread.currentThread().isInterrupted()) {
70+
while (!Thread.currentThread().isInterrupted()) {
7171

7272
for (SelectionKey selectionKey : selector.keys()) {
7373
SocketChannelFrameHandlerState state = (SocketChannelFrameHandlerState) selectionKey.attachment();

src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void configure(SSLEngine sslEngine) throws IOException {
121121
private void sendAndVerifyMessage(int size) throws Exception {
122122
CountDownLatch latch = new CountDownLatch(1);
123123
connection = basicGetBasicConsume(connection, QUEUE, latch, size);
124-
boolean messagesReceived = latch.await(5, TimeUnit.SECONDS);
124+
boolean messagesReceived = latch.await(10, TimeUnit.SECONDS);
125125
assertTrue("Message has not been received", messagesReceived);
126126
}
127127

0 commit comments

Comments
 (0)