You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/10/13 08:03:27 UTC
camel git commit: Remove the useless condition.
Repository: camel
Updated Branches:
refs/heads/master 5652ae9f3 -> fc64c5d08
Remove the useless condition.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fc64c5d0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc64c5d0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc64c5d0
Branch: refs/heads/master
Commit: fc64c5d081ad4d8d6eaa98275004f5ae3ca9e3af
Parents: 5652ae9
Author: Kui LIU <br...@gmail.com>
Authored: Thu Oct 12 16:00:02 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Oct 13 10:03:04 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/mail/MailConfiguration.java | 2 +-
.../java/org/apache/camel/component/mllp/impl/MllpSocketUtil.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fc64c5d0/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
----------------------------------------------------------------------
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 f91c608..2ab03bd 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 class MailConfiguration implements Cloneable {
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()));
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fc64c5d0/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpSocketUtil.java
----------------------------------------------------------------------
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 d6a05d7..0e3f07e 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 final class MllpSocketUtil {
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;
}
}