Skip to content

Commit 3f04006

Browse files
author
Simon MacMullen
committed
Add some checkShutdownSignal()s
1 parent 527e4cf commit 3f04006

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

test/src/com/rabbitmq/client/test/functional/BindingLifecycle.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ public void testExchangeIfUnused() throws IOException {
137137
try {
138138
channel.exchangeDelete(binding.x, true);
139139
}
140-
catch (Exception e) {
141-
// do nothing, this is the correct behaviour
140+
catch (IOException e) {
141+
checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
142142
openChannel();
143143
deleteExchangeAndQueue(binding);
144144
return;

test/src/com/rabbitmq/client/test/functional/BindingLifecycleBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ protected void doAutoDelete(boolean durable, int queues) throws IOException {
154154
channel.queueBind(binding.q, binding.x, binding.k);
155155
sendRoutable(binding);
156156
}
157-
catch (Exception e) {
158-
// do nothing, this is the correct behaviour
157+
catch (IOException e) {
158+
checkShutdownSignal(AMQP.NOT_FOUND, e);
159159
channel = null;
160160
return;
161161
}

test/src/com/rabbitmq/client/test/functional/QueueLifecycle.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ public void testQueueAutoDelete() throws IOException {
139139
try {
140140
verifyQueueExists(name);
141141
} catch (IOException ioe) {
142+
checkShutdownSignal(AMQP.NOT_FOUND, ioe);
142143
return;
143144
}
144145
fail("Queue should have been auto-deleted after we removed its only consumer");

0 commit comments

Comments
 (0)