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 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/f85c6931/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 964831b..b6f04d8 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 @@ -260,7 +260,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()); } @@ -315,7 +317,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/f85c6931/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 34429ea..71ed5b1 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 @@ -193,7 +193,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/f85c6931/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); }
