Updated Branches: refs/heads/camel-2.11.x 8221f2ce6 -> a1c4835ea
CAMEL-6464: connectionTimeout property is ignored by JavaMail Thanks to Marco Zapletal for reporting it Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1c4835e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1c4835e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1c4835e Branch: refs/heads/camel-2.11.x Commit: a1c4835eaa5ab8173cfb357a373ded0cf363ca06 Parents: 8221f2c Author: cmueller <[email protected]> Authored: Thu Jun 20 21:26:44 2013 +0200 Committer: cmueller <[email protected]> Committed: Thu Jun 20 22:14:38 2013 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/component/mail/MailConfiguration.java | 4 ++-- .../main/java/org/apache/camel/component/mail/MailConstants.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a1c4835e/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 4614f40..bb0d70e 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 @@ -55,7 +55,7 @@ public class MailConfiguration implements Cloneable { private String replyTo; private int fetchSize = -1; private boolean debugMode; - private long connectionTimeout = MailConstants.MAIL_DEFAULT_CONNECTION_TIMEOUT; + private int connectionTimeout = MailConstants.MAIL_DEFAULT_CONNECTION_TIMEOUT; private boolean dummyTrustManager; private String contentType = "text/plain"; private String alternativeBodyHeader = MailConstants.MAIL_ALTERNATIVE_BODY; @@ -418,7 +418,7 @@ public class MailConfiguration implements Cloneable { return connectionTimeout; } - public void setConnectionTimeout(long connectionTimeout) { + public void setConnectionTimeout(int connectionTimeout) { this.connectionTimeout = connectionTimeout; } http://git-wip-us.apache.org/repos/asf/camel/blob/a1c4835e/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java ---------------------------------------------------------------------- diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java index 65fd523..10d4cee 100644 --- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java +++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java @@ -23,7 +23,7 @@ public final class MailConstants { public static final String MAIL_DEFAULT_FOLDER = "INBOX"; public static final String MAIL_DEFAULT_FROM = "camel@localhost"; public static final String MAIL_MESSAGE_ID = "CamelMailMessageId"; - public static final long MAIL_DEFAULT_CONNECTION_TIMEOUT = 30000L; + public static final int MAIL_DEFAULT_CONNECTION_TIMEOUT = 30000; private MailConstants() { // utility class
