Consistent MonoToListenableFutureAdapter.cancel()

Issue: SPR-17336
2018-10-09 14:55:04 -04:00
parent 29ff8a8d12
commit bef22ec9b5
2 changed files with 74 additions and 1 deletions
--- a/spring-messaging/src/main/java/org/springframework/messaging/support/AbstractMonoToListenableFutureAdapter.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/support/AbstractMonoToListenableFutureAdapter.java
@@ -89,7 +89,8 @@ abstract class AbstractMonoToListenableFutureAdapter<S, T> implements Listenable
 			return false;
 		}
 		this.monoProcessor.cancel();
-		return true;
+		// isCancelled may still return false, if mono completed before the cancel
+		return this.monoProcessor.isCancelled();
 	}

 	@Override