From 723d2bb26b5ad250feef5abe5082fb042ca3bf69 Mon Sep 17 00:00:00 2001 From: Kui LIU Date: Thu, 12 Oct 2017 16:00:02 +0200 Subject: [PATCH] Remove the useless condition. --- .../java/org/apache/camel/component/mail/MailConfiguration.java | 2 +- .../org/apache/camel/component/mllp/impl/MllpSocketUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java index f91c608f0d7ec..2ab03bd8b58de 100644 --- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java +++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java @@ -167,7 +167,7 @@ public void configure(URI uri) { int port = uri.getPort(); if (port > 0) { setPort(port); - } else if (port <= 0 && this.port <= 0) { + } else if (this.port <= 0) { // resolve default port if no port number was provided, and not already configured with a port number setPort(MailUtils.getDefaultPortForProtocol(uri.getScheme())); } diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpSocketUtil.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpSocketUtil.java index d6a05d7294bac..0e3f07e4a117b 100644 --- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpSocketUtil.java +++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpSocketUtil.java @@ -218,7 +218,7 @@ public static int findEndOfMessage(byte[] payload, int length) { if (payload != null && length >= 0) { for (int i = Math.min(length, payload.length) - 1; i > 0; --i) { if (payload[i] == END_OF_DATA) { - if (i > 0 && payload[i - 1] == END_OF_BLOCK) { + if (payload[i - 1] == END_OF_BLOCK) { return i - 1; } }