You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/06/20 22:13:11 UTC
[2/3] git commit: CAMEL-6464: connectionTimeout property is ignored
by JavaMail Thanks to Marco Zapletal for reporting it
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/b21239f7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b21239f7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b21239f7
Branch: refs/heads/master
Commit: b21239f709384f9d7c594d920f16c71d0007f61e
Parents: a52864d
Author: cmueller <cm...@apache.org>
Authored: Thu Jun 20 21:26:44 2013 +0200
Committer: cmueller <cm...@apache.org>
Committed: Thu Jun 20 22:08:01 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/b21239f7/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/b21239f7/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