Author: cmueller
Date: Mon Apr 29 20:29:56 2013
New Revision: 1477321
URL: http://svn.apache.org/r1477321
Log:
fixed some sonar issue: Empty If Stmt
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=1477321&r1=1477320&r2=1477321&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
Mon Apr 29 20:29:56 2013
@@ -407,8 +407,6 @@ 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);
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1477321&r1=1477320&r2=1477321&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Mon Apr 29 20:29:56 2013
@@ -2014,9 +2014,7 @@ public class DefaultCamelContext extends
// check in existing already started as well
for (RouteStartupOrder order : routeStartupOrder) {
String otherId = order.getRoute().getId();
- 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()) {
+ 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.");
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java?rev=1477321&r1=1477320&r2=1477321&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
Mon Apr 29 20:29:56 2013
@@ -224,11 +224,7 @@ public class ResequencerEngine<E> {
}
// start delivery if current element is successor of last delivered
element
- if (successorOfLastDelivered(element)) {
- // nothing to schedule
- } else if (sequence.predecessor(element) != null) {
- // nothing to schedule
- } else {
+ if (!successorOfLastDelivered(element) &&
sequence.predecessor(element) != null) {
element.schedule(defineTimeout());
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java?rev=1477321&r1=1477320&r2=1477321&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
Mon Apr 29 20:29:56 2013
@@ -260,9 +260,7 @@ 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() == ExchangePattern.InOptionalOut) {
- // keep as is
- } else if (result.getPattern().isOutCapable() && !result.hasOut()
&& !result.isFailed()) {
+ if (result.getPattern().isOutCapable() && !result.hasOut() &&
!result.isFailed()) {
// copy IN to OUT as we expect a OUT response
result.getOut().copyFrom(source.getIn());
}
@@ -317,9 +315,7 @@ 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() == ExchangePattern.InOptionalOut) {
- // keep as is
- } else if (result.getPattern().isOutCapable() && !result.hasOut()
&& !result.isFailed()) {
+ if (result.getPattern().isOutCapable() && !result.hasOut() &&
!result.isFailed()) {
// copy IN to OUT as we expect a OUT response
result.getOut().copyFrom(source.getIn());
}
Modified:
camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java?rev=1477321&r1=1477320&r2=1477321&view=diff
==============================================================================
---
camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java
(original)
+++
camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java
Mon Apr 29 20:29:56 2013
@@ -193,9 +193,7 @@ public class KestrelConsumer extends Def
// We didn't get a value back from kestrel
if (isRunAllowed() && !shutdownPending) {
- if (endpoint.getConfiguration().getWaitTimeMs() > 0) {
- // Kestrel did the blocking for us
- } else {
+ if (endpoint.getConfiguration().getWaitTimeMs() <= 0) {
// 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.
Modified:
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java?rev=1477321&r1=1477320&r2=1477321&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
(original)
+++
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
Mon Apr 29 20:29:56 2013
@@ -207,10 +207,7 @@ public final class Rfc3164SyslogConverte
charFound = (char) (byteBuffer.get() & 0xff);
int day = 0;
- if (charFound == ' ') {
- //Extra space for the day - this is okay.
- //Just ignored per the spec.
- } else {
+ if (charFound != ' ') {
day *= 10;
day += Character.digit(charFound, 10);
}
