GH-2724: Fix RabbitFuture for interrupted thread

Fixes: #2724

(cherry picked from commit ec35739)

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/RabbitFuture.java

@@ -78,21 +78,33 @@ Message getRequestMessage() {
 
  @Override
  public boolean complete(T value) {
- cancelTimeoutTaskIfAny();
- return super.complete(value);
+ try {
+ return super.complete(value);
+ }
+ finally {
+ cancelTimeoutTaskIfAny();
+ }
  }
 
  @Override
  public boolean completeExceptionally(Throwable ex) {
- cancelTimeoutTaskIfAny();
- return super.completeExceptionally(ex);
+ try {
+ return super.completeExceptionally(ex);
+ }
+ finally {
+ cancelTimeoutTaskIfAny();
+ }
  }
 
  @Override
  public boolean cancel(boolean mayInterruptIfRunning) {
- cancelTimeoutTaskIfAny();
  this.canceler.accept(this.correlationId, this.channelHolder);
- return super.cancel(mayInterruptIfRunning);
+ try {
+ return super.cancel(mayInterruptIfRunning);
+ }
+ finally {
+ cancelTimeoutTaskIfAny();
+ }
  }
 
  private void cancelTimeoutTaskIfAny() {