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 <[email protected]> Authored: Sat May 18 08:48:51 2013 +0200 Committer: Claus Ibsen <[email protected]> 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 ResequencerEngine<E> { } // 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/8bf62847/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java b/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java index 3034314..851dea2 100644 --- a/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java +++ b/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java @@ -259,7 +259,9 @@ public final class ExchangeHelper { if (result == source) { // we just need to ensure MEP is as expected (eg copy result to OUT if out capable) // and the result is not failed - if (result.getPattern().isOutCapable() && !result.hasOut() && !result.isFailed()) { + if (result.getPattern() == ExchangePattern.InOptionalOut) { + // keep as is + } else if (result.getPattern().isOutCapable() && !result.hasOut() && !result.isFailed()) { // copy IN to OUT as we expect a OUT response result.getOut().copyFrom(source.getIn()); } @@ -314,7 +316,9 @@ public final class ExchangeHelper { if (result == source) { // we just need to ensure MEP is as expected (eg copy result to OUT if out capable) // and the result is not failed - if (result.getPattern().isOutCapable() && !result.hasOut() && !result.isFailed()) { + if (result.getPattern() == ExchangePattern.InOptionalOut) { + // keep as is + } else if (result.getPattern().isOutCapable() && !result.hasOut() && !result.isFailed()) { // copy IN to OUT as we expect a OUT response result.getOut().copyFrom(source.getIn()); } http://git-wip-us.apache.org/repos/asf/camel/blob/8bf62847/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java b/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java index f8f0d07..e45e829 100644 --- a/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java +++ b/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java @@ -191,7 +191,9 @@ public class KestrelConsumer extends DefaultConsumer implements ShutdownAware { // We didn't get a value back from kestrel if (isRunAllowed() && !shutdownPending) { - if (endpoint.getConfiguration().getWaitTimeMs() <= 0) { + if (endpoint.getConfiguration().getWaitTimeMs() > 0) { + // Kestrel did the blocking for us + } else { // We're doing non-blocking get, so in between we // should at least sleep some short period of time // so this loop doesn't go nuts so tightly. http://git-wip-us.apache.org/repos/asf/camel/blob/8bf62847/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java ---------------------------------------------------------------------- diff --git a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java index 79c50d6..fb47e5b 100644 --- a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java +++ b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java @@ -207,7 +207,10 @@ public final class Rfc3164SyslogConverter { charFound = (char) (byteBuffer.get() & 0xff); int day = 0; - if (charFound != ' ') { + if (charFound == ' ') { + //Extra space for the day - this is okay. + //Just ignored per the spec. + } else { day *= 10; day += Character.digit(charFound, 10); }
