Author: ningjiang Date: Thu Feb 21 03:23:28 2013 New Revision: 1448503 URL: http://svn.apache.org/r1448503 Log: CAMEL-6089 fix the NPE issue across the camel-cxf blueprint config with thanks to Aki Merged revisions 1448498 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1448498 | ningjiang | 2013-02-21 11:08:36 +0800 (Thu, 21 Feb 2013) | 10 lines Merged revisions 1448493 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1448493 | ningjiang | 2013-02-21 10:50:12 +0800 (Thu, 21 Feb 2013) | 1 line CAMEL-6089 fix the NPE issue across the camel-cxf blueprint config with thanks to Aki ........ ................ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1448493 Merged /camel/branches/camel-2.10.x:r1448498 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java?rev=1448503&r1=1448502&r2=1448503&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java (original) +++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java Thu Feb 21 03:23:28 2013 @@ -74,13 +74,13 @@ public class EndpointDefinitionParser ex Metadata map = parseMapData(context, endpointConfig, elem); endpointConfig.addProperty(name, map); } else if ("binding".equals(name)) { - setFirstChildAsProperty(element, context, endpointConfig, "bindingConfig"); + setFirstChildAsProperty(elem, context, endpointConfig, "bindingConfig"); } else if ("inInterceptors".equals(name) || "inFaultInterceptors".equals(name) || "outInterceptors".equals(name) || "outFaultInterceptors".equals(name) || "features".equals(name) || "schemaLocations".equals(name) || "handlers".equals(name)) { Metadata list = parseListData(context, endpointConfig, elem); endpointConfig.addProperty(name, list); } else { - setFirstChildAsProperty(element, context, endpointConfig, name); + setFirstChildAsProperty(elem, context, endpointConfig, name); } elem = DOMUtils.getNextElement(elem); Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java?rev=1448503&r1=1448502&r2=1448503&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java (original) +++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java Thu Feb 21 03:23:28 2013 @@ -63,7 +63,7 @@ public class RsClientDefinitionParser ex Metadata map = parseMapData(context, beanMetadata, elem); beanMetadata.addProperty(name, map); } else if ("binding".equals(name)) { - setFirstChildAsProperty(element, context, beanMetadata, "bindingConfig"); + setFirstChildAsProperty(elem, context, beanMetadata, "bindingConfig"); } else if ("inInterceptors".equals(name) || "inFaultInterceptors".equals(name) || "outInterceptors".equals(name) || "outFaultInterceptors".equals(name) || "features".equals(name) || "schemaLocations".equals(name) || "handlers".equals(name)) { Metadata list = parseListData(context, beanMetadata, elem); @@ -79,7 +79,7 @@ public class RsClientDefinitionParser ex value.setObject(resources); beanMetadata.addProperty(name, value); } else { - setFirstChildAsProperty(element, context, beanMetadata, name); + setFirstChildAsProperty(elem, context, beanMetadata, name); } } Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java?rev=1448503&r1=1448502&r2=1448503&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java (original) +++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java Thu Feb 21 03:23:28 2013 @@ -65,7 +65,7 @@ public class RsServerDefinitionParser ex Metadata map = parseMapData(context, beanMetadata, elem); beanMetadata.addProperty(name, map); } else if ("binding".equals(name)) { - setFirstChildAsProperty(element, context, beanMetadata, "bindingConfig"); + setFirstChildAsProperty(elem, context, beanMetadata, "bindingConfig"); } else if ("inInterceptors".equals(name) || "inFaultInterceptors".equals(name) || "outInterceptors".equals(name) || "outFaultInterceptors".equals(name) || "features".equals(name) || "schemaLocations".equals(name) || "handlers".equals(name)) { Metadata list = parseListData(context, beanMetadata, elem); @@ -80,7 +80,7 @@ public class RsServerDefinitionParser ex value.setObject(resources); beanMetadata.addProperty(name, value); } else { - setFirstChildAsProperty(element, context, beanMetadata, name); + setFirstChildAsProperty(elem, context, beanMetadata, name); } }
