Author: cmueller Date: Mon Apr 29 20:10:59 2013 New Revision: 1477313 URL: http://svn.apache.org/r1477313 Log: fixed the sonar issue: Correctness - An apparent infinite loop
Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java Modified: camel/branches/camel-2.10.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.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java?rev=1477313&r1=1477312&r2=1477313&view=diff ============================================================================== --- camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java (original) +++ camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java Mon Apr 29 20:10:59 2013 @@ -56,8 +56,7 @@ public class RsClientDefinitionParser ex } } - Element elem = DOMUtils.getFirstElement(element); - while (elem != null) { + for (Element elem = DOMUtils.getFirstElement(element); elem != null; elem = DOMUtils.getNextElement(elem)) { String name = elem.getLocalName(); if ("properties".equals(name) || "headers".equals(name)) { Metadata map = parseMapData(context, beanMetadata, elem); @@ -80,7 +79,6 @@ public class RsClientDefinitionParser ex } else { setFirstChildAsProperty(elem, context, beanMetadata, name); } - elem = DOMUtils.getNextElement(elem); } if (StringUtils.isEmpty(bus)) { Modified: camel/branches/camel-2.10.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.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java?rev=1477313&r1=1477312&r2=1477313&view=diff ============================================================================== --- camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java (original) +++ camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java Mon Apr 29 20:10:59 2013 @@ -56,8 +56,7 @@ public class RsServerDefinitionParser ex } } - Element elem = DOMUtils.getFirstElement(element); - while (elem != null) { + for (Element elem = DOMUtils.getFirstElement(element); elem != null; elem = DOMUtils.getNextElement(elem)) { String name = elem.getLocalName(); if ("properties".equals(name) || "extensionMappings".equals(name) @@ -83,7 +82,6 @@ public class RsServerDefinitionParser ex } else { setFirstChildAsProperty(elem, context, beanMetadata, name); } - elem = DOMUtils.getNextElement(elem); } if (StringUtils.isEmpty(bus)) {