You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/03/14 19:29:30 UTC
[5/6] camel git commit: Move null to right of comparisons
Move null to right of comparisons
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4631a045
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4631a045
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4631a045
Branch: refs/heads/master
Commit: 4631a04522027378000de88a5d3096b2d8f8345b
Parents: b98c5c8
Author: Quinn Stevenson <qu...@pronoia-solutions.com>
Authored: Sun Mar 13 10:28:55 2016 -0600
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Mar 14 19:23:15 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/dataset/DataSetEndpoint.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4631a045/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
index 21fe5de..70f24c5 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
@@ -122,7 +122,7 @@ public class DataSetEndpoint extends MockEndpoint implements Service {
Exchange exchange = createExchange();
getDataSet().populateMessage(exchange, messageIndex);
- if (null == disableDataSetIndex || !disableDataSetIndex) {
+ if (disableDataSetIndex == null || !disableDataSetIndex) {
Message in = exchange.getIn();
in.setHeader(Exchange.DATASET_INDEX, messageIndex);
}
@@ -239,7 +239,7 @@ public class DataSetEndpoint extends MockEndpoint implements Service {
// now let's assert that they are the same
if (log.isDebugEnabled()) {
- if (null != copy.getIn().getHeader(Exchange.DATASET_INDEX)) {
+ if (copy.getIn().getHeader(Exchange.DATASET_INDEX) != null) {
log.debug("Received message: {} (DataSet index={}) = {}",
new Object[]{index, copy.getIn().getHeader(Exchange.DATASET_INDEX, Integer.class), copy});
} else {
@@ -256,9 +256,9 @@ public class DataSetEndpoint extends MockEndpoint implements Service {
}
protected void assertMessageExpected(long index, Exchange expected, Exchange actual) throws Exception {
- if (null == disableDataSetIndex) {
+ if (disableDataSetIndex == null) {
Long dataSetIndexHeaderValue = actual.getIn().getHeader(Exchange.DATASET_INDEX, Long.class);
- if (null != dataSetIndexHeaderValue) {
+ if (dataSetIndexHeaderValue != null) {
assertEquals("Header: " + Exchange.DATASET_INDEX, index, dataSetIndexHeaderValue, actual);
} else {
actual.getIn().setHeader(Exchange.DATASET_INDEX, index);