Author: cmueller
Date: Mon Apr 29 19:52:31 2013
New Revision: 1477304
URL: http://svn.apache.org/r1477304
Log:
fixed the sonar issue: Correctness - An apparent infinite loop
Modified:
camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
Modified:
camel/branches/camel-2.11.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.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java?rev=1477304&r1=1477303&r2=1477304&view=diff
==============================================================================
---
camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
(original)
+++
camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
Mon Apr 29 19:52:31 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.11.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.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java?rev=1477304&r1=1477303&r2=1477304&view=diff
==============================================================================
---
camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
(original)
+++
camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
Mon Apr 29 19:52:31 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)) {
