You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/02/09 11:02:20 UTC
svn commit: r1068824 -
/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
Author: ningjiang
Date: Wed Feb 9 10:02:20 2011
New Revision: 1068824
URL: http://svn.apache.org/viewvc?rev=1068824&view=rev
Log:
CAMEL-3629 Remove creating DefaultCamelContext from CamelCoduit
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java?rev=1068824&r1=1068823&r2=1068824&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java Wed Feb 9 10:02:20 2011
@@ -31,6 +31,7 @@ import org.apache.camel.component.cxf.ut
import org.apache.camel.component.cxf.util.CxfMessageHelper;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.HeaderFilterStrategy;
+import org.apache.camel.util.ObjectHelper;
import org.apache.cxf.Bus;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.configuration.Configurable;
@@ -100,10 +101,7 @@ public class CamelConduit extends Abstra
}
public CamelContext getCamelContext() {
- if (camelContext == null) {
- LOG.info("No CamelContext injected, create a default one");
- camelContext = new DefaultCamelContext();
- }
+ ObjectHelper.notNull(camelContext, "CamelContext", this);
return camelContext;
}