Author: davsclaus
Date: Wed Feb 24 05:47:09 2010
New Revision: 915689
URL: http://svn.apache.org/viewvc?rev=915689&view=rev
Log:
CAMEL-1530: Renamed option to better match type.
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java?rev=915689&r1=915688&r2=915689&view=diff
==============================================================================
---
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
(original)
+++
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
Wed Feb 24 05:47:09 2010
@@ -55,7 +55,7 @@
private static final transient Log LOG =
LogFactory.getLog(HttpComponent.class);
protected HttpClientConfigurer httpClientConfigurer;
- protected ClientConnectionManager httpConnectionManager;
+ protected ClientConnectionManager clientConnectionManager;
protected HttpBinding httpBinding;
// options to the default created http connection manager
@@ -155,13 +155,13 @@
}
// create default connection manager if none provided
- if (httpConnectionManager == null) {
- httpConnectionManager = createConnectionManager(clientParams, uri);
+ if (clientConnectionManager == null) {
+ clientConnectionManager = createConnectionManager(clientParams,
uri);
} else if (LOG.isDebugEnabled()) {
- LOG.debug("Using existing ClientConnectionManager: " +
httpConnectionManager);
+ LOG.debug("Using existing ClientConnectionManager: " +
clientConnectionManager);
}
- HttpEndpoint endpoint = new HttpEndpoint(uri, this, httpUri,
clientParams, httpConnectionManager, httpClientConfigurer);
+ HttpEndpoint endpoint = new HttpEndpoint(uri, this, httpUri,
clientParams, clientConnectionManager, httpClientConfigurer);
if (httpBinding != null) {
endpoint.setBinding(httpBinding);
}
@@ -251,12 +251,12 @@
this.httpClientConfigurer = httpClientConfigurer;
}
- public ClientConnectionManager getHttpConnectionManager() {
- return httpConnectionManager;
+ public ClientConnectionManager getClientConnectionManager() {
+ return clientConnectionManager;
}
- public void setHttpConnectionManager(ClientConnectionManager
httpConnectionManager) {
- this.httpConnectionManager = httpConnectionManager;
+ public void setClientConnectionManager(ClientConnectionManager
clientConnectionManager) {
+ this.clientConnectionManager = clientConnectionManager;
}
public HttpBinding getHttpBinding() {
@@ -286,10 +286,10 @@
@Override
public void stop() throws Exception {
// shutdown connection manager
- if (httpConnectionManager != null) {
- LOG.info("Shutting down ClientConnectionManager: " +
httpConnectionManager);
- httpConnectionManager.shutdown();
- httpConnectionManager = null;
+ if (clientConnectionManager != null) {
+ LOG.info("Shutting down ClientConnectionManager: " +
clientConnectionManager);
+ clientConnectionManager.shutdown();
+ clientConnectionManager = null;
}
super.stop();
}
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java?rev=915689&r1=915688&r2=915689&view=diff
==============================================================================
---
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
(original)
+++
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
Wed Feb 24 05:47:09 2010
@@ -49,7 +49,7 @@
private URI httpUri;
private HttpParams clientParams;
private HttpClientConfigurer httpClientConfigurer;
- private ClientConnectionManager httpConnectionManager;
+ private ClientConnectionManager clientConnectionManager;
private HttpClient httpClient;
private boolean throwExceptionOnFailure = true;
private boolean bridgeEndpoint;
@@ -63,18 +63,18 @@
this(endPointURI, component, httpURI, null);
}
- public HttpEndpoint(String endPointURI, HttpComponent component, URI
httpURI, ClientConnectionManager httpConnectionManager) throws
URISyntaxException {
- this(endPointURI, component, httpURI, new BasicHttpParams(),
httpConnectionManager, null);
+ public HttpEndpoint(String endPointURI, HttpComponent component, URI
httpURI, ClientConnectionManager clientConnectionManager) throws
URISyntaxException {
+ this(endPointURI, component, httpURI, new BasicHttpParams(),
clientConnectionManager, null);
}
public HttpEndpoint(String endPointURI, HttpComponent component, URI
httpURI, HttpParams clientParams,
- ClientConnectionManager httpConnectionManager,
HttpClientConfigurer clientConfigurer) throws URISyntaxException {
+ ClientConnectionManager clientConnectionManager,
HttpClientConfigurer clientConfigurer) throws URISyntaxException {
super(endPointURI, component);
this.component = component;
this.httpUri = httpURI;
this.clientParams = clientParams;
this.httpClientConfigurer = clientConfigurer;
- this.httpConnectionManager = httpConnectionManager;
+ this.clientConnectionManager = clientConnectionManager;
}
public Producer createProducer() throws Exception {
@@ -106,9 +106,9 @@
*/
protected HttpClient createHttpClient() {
ObjectHelper.notNull(clientParams, "clientParams");
- ObjectHelper.notNull(httpConnectionManager, "httpConnectionManager");
+ ObjectHelper.notNull(clientConnectionManager, "httpConnectionManager");
- HttpClient answer = new DefaultHttpClient(httpConnectionManager,
getClientParams());
+ HttpClient answer = new DefaultHttpClient(clientConnectionManager,
getClientParams());
// configure http proxy from camelContext
if
(ObjectHelper.isNotEmpty(getCamelContext().getProperties().get("http.proxyHost"))
&&
ObjectHelper.isNotEmpty(getCamelContext().getProperties().get("http.proxyPort")))
{
@@ -222,12 +222,12 @@
this.httpUri = httpUri;
}
- public ClientConnectionManager getHttpConnectionManager() {
- return httpConnectionManager;
+ public ClientConnectionManager getClientConnectionManager() {
+ return clientConnectionManager;
}
- public void setHttpConnectionManager(ClientConnectionManager
httpConnectionManager) {
- this.httpConnectionManager = httpConnectionManager;
+ public void setClientConnectionManager(ClientConnectionManager
clientConnectionManager) {
+ this.clientConnectionManager = clientConnectionManager;
}
public HeaderFilterStrategy getHeaderFilterStrategy() {
@@ -270,5 +270,4 @@
this.chunked = chunked;
}
-
}
