Skip to content

Commit c4d1c38

Browse files
author
Matthias Radestock
committed
merge bug19493 into default
2 parents fac60a6 + b7b2084 commit c4d1c38

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

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

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -540,22 +540,23 @@ public boolean processControlCommand(Command c)
540540
// See the detailed comments in ChannelN.processAsync.
541541

542542
Method method = c.getMethod();
543-
if (isOpen()) {
544-
// Normal command.
545-
if (method instanceof AMQP.Connection.Close) {
546-
handleConnectionClose(c);
547-
return true;
548-
} else {
549-
return false;
550-
}
543+
544+
if (method instanceof AMQP.Connection.Close) {
545+
handleConnectionClose(c);
546+
return true;
551547
} else {
552-
// Quiescing.
553-
if (method instanceof AMQP.Connection.CloseOk) {
554-
// It's our final "RPC".
548+
if (isOpen()) {
549+
// Normal command.
555550
return false;
556551
} else {
557-
// Ignore all others.
558-
return true;
552+
// Quiescing.
553+
if (method instanceof AMQP.Connection.CloseOk) {
554+
// It's our final "RPC".
555+
return false;
556+
} else {
557+
// Ignore all others.
558+
return true;
559+
}
559560
}
560561
}
561562
}

0 commit comments

Comments
 (0)