You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2013/07/09 21:53:26 UTC
svn commit: r1501500 -
/activemq/trunk/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
Author: tabish
Date: Tue Jul 9 19:53:26 2013
New Revision: 1501500
URL: http://svn.apache.org/r1501500
Log:
workaround for issue: https://issues.apache.org/jira/browse/AMQ-4307
attempt to get around the deadlock by detecting and interrupting the locked thread.
Modified:
activemq/trunk/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
Modified: activemq/trunk/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java?rev=1501500&r1=1501499&r2=1501500&view=diff
==============================================================================
--- activemq/trunk/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java (original)
+++ activemq/trunk/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java Tue Jul 9 19:53:26 2013
@@ -303,7 +303,7 @@ public class HttpClientTransport extends
abortThread.start();
abortThread.join(2000);
- if (!abortThread.isAlive()) {
+ if (abortThread.isAlive() && !httpMethod.isAborted()) {
abortThread.interrupt();
}
}