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/08/15 17:18:30 UTC
svn commit: r1157883 - in /camel/branches/camel-2.8.x: ./
components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
Author: ningjiang
Date: Mon Aug 15 15:18:28 2011
New Revision: 1157883
URL: http://svn.apache.org/viewvc?rev=1157883&view=rev
Log:
Merged revisions 1157878 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1157878 | ningjiang | 2011-08-15 23:09:11 +0800 (Mon, 15 Aug 2011) | 1 line
CAMEL-4137 CxfNamespanceHandler should not set the TCCL
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 15 15:18:28 2011
@@ -1 +1 @@
-/camel/trunk:1155230,1156108,1156260,1156524,1157348,1157798
+/camel/trunk:1155230,1156108,1156260,1156524,1157348,1157798,1157878
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 15 15:18:28 2011
@@ -1 +1 @@
-/camel/trunk:1-1148091,1149488,1153146,1153323,1155229-1155231,1155233-1155276,1155278-1155291,1155293-1155318,1155320-1155327,1156108,1156260,1156524,1157348,1157798
+/camel/trunk:1-1148091,1149488,1153146,1153323,1155229-1155231,1155233-1155276,1155278-1155291,1155293-1155318,1155320-1155327,1156108,1156260,1156524,1157348,1157798,1157878
Modified: camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java?rev=1157883&r1=1157882&r2=1157883&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java (original)
+++ camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java Mon Aug 15 15:18:28 2011
@@ -50,9 +50,6 @@ public class CxfNamespaceHandler impleme
public Metadata parse(Element element, ParserContext context) {
Metadata answer = null;
String s = element.getLocalName();
- // Setting the thread context classloader to workaround the issue BlueprintBus ClassLoader
- // This line can be removed when CXF 2.4.2 is released.
- Thread.currentThread().setContextClassLoader(BlueprintBus.class.getClassLoader());
if ("cxfEndpoint".equals(s)) {
LOG.debug("parsing the cxfEndpoint element");
answer = new EndpointDefinitionParser().parse(element, context);