From commits-return-12172-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Mon Nov 02 09:05:40 2009 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 48158 invoked from network); 2 Nov 2009 09:05:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Nov 2009 09:05:40 -0000 Received: (qmail 52933 invoked by uid 500); 2 Nov 2009 09:05:40 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 52901 invoked by uid 500); 2 Nov 2009 09:05:40 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 52892 invoked by uid 99); 2 Nov 2009 09:05:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Nov 2009 09:05:40 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Nov 2009 09:05:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 338D823888D8; Mon, 2 Nov 2009 09:05:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091102090518.338D823888D8@eris.apache.org> 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() {