Author: dkulp
Date: Thu Jul 7 17:41:06 2011
New Revision: 1143932
URL: http://svn.apache.org/viewvc?rev=1143932&view=rev
Log:
Merged revisions 1134252 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1134252 | ningjiang | 2011-06-10 05:30:17 -0400 (Fri, 10 Jun 2011) | 1 line
CAMEL-4073 Fixed the NPE when misconfiguring the CXF endpoint url
........
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/FailedToCreateConsumerException.java
camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
camel/branches/camel-2.7.x/components/camel-http/ (props changed)
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 7 17:41:06 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1095469,1095471,1095475-1095476,1099417,1102162,1104076,1124497,1131411,1134501,1135364,1143925
+/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1095469,1095471,1095475-1095476,1099417,1102162,1104076,1124497,1131411,1134252,1134501,1135364,1143925
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 7 17:41:06 2011
@@ -1 +1 @@
-/camel/trunk:1-1088794,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1095469,1095471,1095475-1095476,1099417,1102162,1104076,1124497,1131411,1134501,1135364,1143925
+/camel/trunk:1-1088794,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1095469,1095471,1095475-1095476,1099417,1102162,1104076,1124497,1131411,1134252,1134501,1135364,1143925
Modified:
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/FailedToCreateConsumerException.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/FailedToCreateConsumerException.java?rev=1143932&r1=1143931&r2=1143932&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/FailedToCreateConsumerException.java
(original)
+++
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/FailedToCreateConsumerException.java
Thu Jul 7 17:41:06 2011
@@ -26,6 +26,11 @@ public class FailedToCreateConsumerExcep
private final String uri;
+ public FailedToCreateConsumerException(String endpointURI, Throwable
cause) {
+ super("Failed to create Consumer for endpoint for: " + endpointURI +
". Reason: " + cause, cause);
+ this.uri = endpointURI;
+ }
+
public FailedToCreateConsumerException(Endpoint endpoint, Throwable cause)
{
super("Failed to create Consumer for endpoint: " + endpoint + ".
Reason: " + cause, cause);
this.uri = endpoint.getEndpointUri();
Modified:
camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java?rev=1143932&r1=1143931&r2=1143932&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
Thu Jul 7 17:41:06 2011
@@ -25,6 +25,7 @@ import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.FailedToCreateConsumerException;
+import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.Processor;
import org.apache.camel.component.cxf.CxfConstants;
import org.apache.camel.component.cxf.cxfbean.DefaultCxfBeanBinding;
@@ -114,9 +115,17 @@ public class CamelDestination extends Ab
try {
LOG.debug("establishing Camel connection");
destinationEndpoint =
getCamelContext().getEndpoint(camelDestinationUri);
+ if (destinationEndpoint == null) {
+ throw new NoSuchEndpointException(camelDestinationUri);
+ }
consumer = destinationEndpoint.createConsumer(new
ConsumerProcessor());
ServiceHelper.startService(consumer);
+ } catch (NoSuchEndpointException nex) {
+ throw nex;
} catch (Exception ex) {
+ if (destinationEndpoint == null) {
+ throw new FailedToCreateConsumerException(camelDestinationUri,
ex);
+ }
throw new FailedToCreateConsumerException(destinationEndpoint, ex);
}
}
Propchange: camel/branches/camel-2.7.x/components/camel-http/
('svn:mergeinfo' removed)
