You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2008/11/12 18:20:57 UTC
svn commit: r713426 - in /activemq/camel/trunk/components:
camel-cxf/src/main/java/org/apache/camel/component/cxf/util/
camel-http/src/main/java/org/apache/camel/component/http/
camel-jhc/src/main/java/org/apache/camel/component/jhc/
Author: janstey
Date: Wed Nov 12 09:20:55 2008
New Revision: 713426
URL: http://svn.apache.org/viewvc?rev=713426&view=rev
Log:
Code cleanup
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcProducer.java
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java?rev=713426&r1=713425&r2=713426&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java Wed Nov 12 09:20:55 2008
@@ -165,7 +165,7 @@
}
//TODO check the CxfEndpoint information integration
- public static void checkEndpiontIntegration(CxfEndpoint endpoint, Bus bus) throws CamelException {
+ public static void checkEndpointIntegration(CxfEndpoint endpoint, Bus bus) throws CamelException {
String wsdlLocation = endpoint.getWsdlURL();
QName serviceQName = CxfEndpointUtils.getQName(endpoint.getServiceName());
Modified: activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java?rev=713426&r1=713425&r2=713426&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java (original)
+++ activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java Wed Nov 12 09:20:55 2008
@@ -113,7 +113,9 @@
exception = new HttpOperationFailedException(responseCode, method.getStatusLine());
}
- throw exception;
+ if (exception != null) {
+ throw exception;
+ }
}
} finally {
Modified: activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcProducer.java?rev=713426&r1=713425&r2=713426&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcProducer.java (original)
+++ activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcProducer.java Wed Nov 12 09:20:55 2008
@@ -141,12 +141,14 @@
}
SocketAddress addr = new InetSocketAddress(getEndpoint().getHost(), getEndpoint().getPort());
exchange.setProperty(AsyncCallback.class.getName(), callback);
- SessionRequest req = ioReactor.connect(addr, null, exchange, new MySessionRequestCallback());
+ ioReactor.connect(addr, null, exchange, new MySessionRequestCallback());
return false;
}
protected HttpRequest createRequest(Exchange exchange) {
- String uri = getEndpoint().getEndpointUri();
+ // force creation of uri
+ getEndpoint().getEndpointUri();
+
HttpEntity entity = createEntity(exchange);
HttpRequest req;
if (entity == null) {