activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cshan...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-6397
Date Wed, 17 Aug 2016 13:39:32 GMT
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x 5d28e0cee -> 124bd1ae3


https://issues.apache.org/jira/browse/AMQ-6397

Setting the HTTP timeout for all HttpClients instead of just on send

(cherry picked from commit 06e929f1016571f9e5a024e42a4fc5298d9f9684)


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/124bd1ae
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/124bd1ae
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/124bd1ae

Branch: refs/heads/activemq-5.14.x
Commit: 124bd1ae3d1f015b2e605288e624ecf2f921c67f
Parents: 5d28e0c
Author: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Authored: Wed Aug 17 09:35:18 2016 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Committed: Wed Aug 17 09:39:04 2016 -0400

----------------------------------------------------------------------
 .../apache/activemq/transport/http/HttpClientTransport.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/124bd1ae/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
----------------------------------------------------------------------
diff --git a/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
index 7f446c5..a06e7fd 100755
--- a/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
+++ b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
@@ -124,8 +124,6 @@ public class HttpClientTransport extends HttpTransportSupport {
         HttpResponse answer = null;
         try {
             client = getSendHttpClient();
-            HttpParams params = client.getParams();
-            HttpConnectionParams.setSoTimeout(params, soTimeout);
             answer = client.execute(httpMethod);
             int status = answer.getStatusLine().getStatusCode();
             if (status != HttpStatus.SC_OK) {
@@ -341,6 +339,10 @@ public class HttpClientTransport extends HttpTransportSupport {
                     new UsernamePasswordCredentials(getProxyUser(), getProxyPassword()));
             }
         }
+
+        HttpParams params = client.getParams();
+        HttpConnectionParams.setSoTimeout(params, soTimeout);
+
         return client;
     }
 


Mime
View raw message