activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r831829 - in /activemq/branches/activemq-5.3: activemq-core/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
Date Mon, 02 Nov 2009 09:05:18 GMT
Author: gtully
Date: Mon Nov  2 09:05:17 2009
New Revision: 831829

URL: http://svn.apache.org/viewvc?rev=831829&view=rev
Log:
svn merge -c 831827 https://svn.apache.org/repos/asf/activemq/trunk - https://issues.apache.org/activemq/browse/AMQ-2472

Modified:
    activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java?rev=831829&r1=831828&r2=831829&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java
(original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java
Mon Nov  2 09:05:17 2009
@@ -17,7 +17,6 @@
 package org.apache.activemq;
 
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
 
 import javax.jms.ConnectionFactory;
 import javax.jms.ExceptionListener;

Modified: activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java?rev=831829&r1=831828&r2=831829&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
(original)
+++ activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
Mon Nov  2 09:05:17 2009
@@ -30,15 +30,12 @@
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.HttpMethodRetryHandler;
 import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.NoHttpResponseException;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.HeadMethod;
 import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.params.HttpClientParams;
-import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -199,7 +196,9 @@
     }
 
     protected void doStop(ServiceStopper stopper) throws Exception {
-    	httpMethod.abort();
+        if (httpMethod != null) {
+            httpMethod.abort();
+        }
     }
 
     protected HttpClient createHttpClient() {



Mime
View raw message