[2/2] git commit: Revert fixed some sonar issue: Empty If Stmt

2013-05-18 Thread davsclaus 
Revert fixed some sonar issue: Empty If Stmt

This reverts commit 64d24f56b1145185b4e4c914a701b85b5e80b285.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0a4e7f87
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0a4e7f87
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0a4e7f87

Branch: refs/heads/camel-2.11.x
Commit: 0a4e7f87a8bb5ca4407d5568bd46b83836ec99c4
Parents: eb0238c
Author: Claus Ibsen davscl...@apache.org
Authored: Sat May 18 08:48:51 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sat May 18 08:50:38 2013 +0200

--
 .../org/apache/camel/component/bean/BeanInfo.java  |2 ++
 .../org/apache/camel/impl/DefaultCamelContext.java |4 +++-
 .../processor/resequencer/ResequencerEngine.java   |6 +-
 .../java/org/apache/camel/util/ExchangeHelper.java |8 ++--
 .../camel/component/kestrel/KestrelConsumer.java   |4 +++-
 .../component/syslog/Rfc3164SyslogConverter.java   |5 -
 6 files changed, 23 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0a4e7f87/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java 
b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 72d793e..a511943 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -407,6 +407,8 @@ public class BeanInfo {
 LOG.trace(Parameter #{} is the body parameter using 
expression {}, i, expression);
 parameterInfo.setExpression(expression);
 bodyParameters.add(parameterInfo);
+} else {
+// will ignore the expression for parameter evaluation
 }
 }
 LOG.trace(Parameter #{} has parameter info: , i, parameterInfo);

http://git-wip-us.apache.org/repos/asf/camel/blob/0a4e7f87/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 5097d97..8789aa8 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -2014,7 +2014,9 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 // check in existing already started as well
 for (RouteStartupOrder order : routeStartupOrder) {
 String otherId = order.getRoute().getId();
-if (answer.getStartupOrder() == order.getStartupOrder()) {
+if (answer.getRoute().getId().equals(otherId)) {
+// its the same route id so skip clash check as its the same 
route (can happen when using suspend/resume)
+} else if (answer.getStartupOrder() == order.getStartupOrder()) {
 throw new 
FailedToStartRouteException(answer.getRoute().getId(), startupOrder clash. 
Route  + otherId +  already has startupOrder 
 + answer.getStartupOrder() +  configured which this route 
have as well. Please correct startupOrder to be unique among all your routes.);
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/0a4e7f87/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
 
b/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
index 9fb43f1..9a83cd0 100644
--- 
a/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
+++ 
b/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
@@ -224,7 +224,11 @@ public class ResequencerEngineE {
 }
 
 // start delivery if current element is successor of last delivered 
element
-if (!successorOfLastDelivered(element)  
sequence.predecessor(element) != null) {
+if (successorOfLastDelivered(element)) {
+// nothing to schedule
+} else if (sequence.predecessor(element) != null) {
+// nothing to schedule
+} else {
 element.schedule(defineTimeout());
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/0a4e7f87/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java

[1/2] git commit: Revert fixed some sonar issue: Empty If Stmt

2013-05-18 Thread davsclaus 
Updated Branches:
  refs/heads/camel-2.10.x 9d5883e9b - 8bf62847c
  refs/heads/camel-2.11.x eb0238c1e - 0a4e7f87a


Revert fixed some sonar issue: Empty If Stmt

This reverts commit 64d24f56b1145185b4e4c914a701b85b5e80b285.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8bf62847
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8bf62847
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8bf62847

Branch: refs/heads/camel-2.10.x
Commit: 8bf62847c1e80408e807b784af8a1e40493b51b4
Parents: 9d5883e
Author: Claus Ibsen davscl...@apache.org
Authored: Sat May 18 08:48:51 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sat May 18 08:48:51 2013 +0200

--
 .../org/apache/camel/component/bean/BeanInfo.java  |2 ++
 .../org/apache/camel/impl/DefaultCamelContext.java |4 +++-
 .../processor/resequencer/ResequencerEngine.java   |6 +-
 .../java/org/apache/camel/util/ExchangeHelper.java |8 ++--
 .../camel/component/kestrel/KestrelConsumer.java   |4 +++-
 .../component/syslog/Rfc3164SyslogConverter.java   |5 -
 6 files changed, 23 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8bf62847/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java 
b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 111d6e5..734b160 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -388,6 +388,8 @@ public class BeanInfo {
 LOG.trace(Parameter #{} is the body parameter using 
expression {}, i, expression);
 parameterInfo.setExpression(expression);
 bodyParameters.add(parameterInfo);
+} else {
+// will ignore the expression for parameter evaluation
 }
 }
 LOG.trace(Parameter #{} has parameter info: , i, parameterInfo);

http://git-wip-us.apache.org/repos/asf/camel/blob/8bf62847/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 7a8acd4..1b1d908 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -1985,7 +1985,9 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 // check in existing already started as well
 for (RouteStartupOrder order : routeStartupOrder) {
 String otherId = order.getRoute().getId();
-if (answer.getStartupOrder() == order.getStartupOrder()) {
+if (answer.getRoute().getId().equals(otherId)) {
+// its the same route id so skip clash check as its the same 
route (can happen when using suspend/resume)
+} else if (answer.getStartupOrder() == order.getStartupOrder()) {
 throw new 
FailedToStartRouteException(answer.getRoute().getId(), startupOrder clash. 
Route  + otherId +  already has startupOrder 
 + answer.getStartupOrder() +  configured which this route 
have as well. Please correct startupOrder to be unique among all your routes.);
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/8bf62847/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
 
b/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
index 635d4d9..8565298 100644
--- 
a/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
+++ 
b/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
@@ -205,7 +205,11 @@ public class ResequencerEngineE {
 }
 
 // start delivery if current element is successor of last delivered 
element
-if (!successorOfLastDelivered(element)  
sequence.predecessor(element) != null) {
+if (successorOfLastDelivered(element)) {
+// nothing to schedule
+} else if (sequence.predecessor(element) != null) {
+// nothing to schedule
+} else {
 element.schedule(defineTimeout());
 }
 }

git commit: Revert fixed some sonar issue: Empty If Stmt

2013-05-06 Thread cmueller 
Updated Branches:
  refs/heads/master b0ccd9474 - f85c6931b


Revert fixed some sonar issue: Empty If Stmt

This reverts commit 949d5b800338b764bb57e91c89bd514832e0e024.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f85c6931
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f85c6931
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f85c6931

Branch: refs/heads/master
Commit: f85c6931b541e415c158fa400c1ce6e7f129a8fa
Parents: b0ccd94
Author: Christian Mueller christian.muel...@gmail.com
Authored: Mon May 6 21:43:45 2013 +0200
Committer: Christian Mueller christian.muel...@gmail.com
Committed: Mon May 6 21:43:45 2013 +0200

--
 .../org/apache/camel/component/bean/BeanInfo.java  |2 ++
 .../org/apache/camel/impl/DefaultCamelContext.java |4 +++-
 .../processor/resequencer/ResequencerEngine.java   |6 +-
 .../java/org/apache/camel/util/ExchangeHelper.java |8 ++--
 .../camel/component/kestrel/KestrelConsumer.java   |4 +++-
 .../component/syslog/Rfc3164SyslogConverter.java   |5 -
 6 files changed, 23 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f85c6931/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java 
b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 72d793e..a511943 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -407,6 +407,8 @@ public class BeanInfo {
 LOG.trace(Parameter #{} is the body parameter using 
expression {}, i, expression);
 parameterInfo.setExpression(expression);
 bodyParameters.add(parameterInfo);
+} else {
+// will ignore the expression for parameter evaluation
 }
 }
 LOG.trace(Parameter #{} has parameter info: , i, parameterInfo);

http://git-wip-us.apache.org/repos/asf/camel/blob/f85c6931/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index f5b2525..d69358d 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -2014,7 +2014,9 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 // check in existing already started as well
 for (RouteStartupOrder order : routeStartupOrder) {
 String otherId = order.getRoute().getId();
-if (answer.getStartupOrder() == order.getStartupOrder()) {
+if (answer.getRoute().getId().equals(otherId)) {
+// its the same route id so skip clash check as its the same 
route (can happen when using suspend/resume)
+} else if (answer.getStartupOrder() == order.getStartupOrder()) {
 throw new 
FailedToStartRouteException(answer.getRoute().getId(), startupOrder clash. 
Route  + otherId +  already has startupOrder 
 + answer.getStartupOrder() +  configured which this route 
have as well. Please correct startupOrder to be unique among all your routes.);
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/f85c6931/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
 
b/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
index 9fb43f1..9a83cd0 100644
--- 
a/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
+++ 
b/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
@@ -224,7 +224,11 @@ public class ResequencerEngineE {
 }
 
 // start delivery if current element is successor of last delivered 
element
-if (!successorOfLastDelivered(element)  
sequence.predecessor(element) != null) {
+if (successorOfLastDelivered(element)) {
+// nothing to schedule
+} else if (sequence.predecessor(element) != null) {
+// nothing to schedule
+} else {
 element.schedule(defineTimeout());
 }
 }