From a0d740aac10dd06153ece5e97f3e750dc3dd6df8 Mon Sep 17 00:00:00 2001
From: jbonofre <jbonofre@apache.org>
Date: Thu, 1 Apr 2021 17:13:59 +0200
Subject: [PATCH] [AMQ-6763] Add timeout on transport client to avoid blocking
 thread

---
 .../java/org/apache/activemq/transport/FutureResponse.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/activemq-client/src/main/java/org/apache/activemq/transport/FutureResponse.java b/activemq-client/src/main/java/org/apache/activemq/transport/FutureResponse.java
index ff958699438..ff9328b3cf5 100644
--- a/activemq-client/src/main/java/org/apache/activemq/transport/FutureResponse.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/FutureResponse.java
@@ -42,10 +42,11 @@ public FutureResponse(ResponseCallback responseCallback, TransportFilter transpo
         this.transportFilter = transportFilter;
     }
 
+
     public Response getResult() throws IOException {
         boolean hasInterruptPending = Thread.interrupted();
         try {
-            return responseSlot.take();
+            return responseSlot.poll(2, TimeUnit.MINUTES);
         } catch (InterruptedException e) {
             hasInterruptPending = false;
             throw dealWithInterrupt(e);