You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/11/14 20:44:37 UTC
svn commit: r1201850 - in /camel/branches/camel-2.8.x: ./
components/camel-mail/src/main/java/org/apache/camel/component/mail/
components/camel-mail/src/test/java/org/apache/camel/component/mail/
Author: dkulp
Date: Mon Nov 14 19:44:37 2011
New Revision: 1201850
URL: http://svn.apache.org/viewvc?rev=1201850&view=rev
Log:
Merged revisions 1195144 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1195144 | davsclaus | 2011-10-30 06:54:51 -0400 (Sun, 30 Oct 2011) | 1 line
CAMEL-4225: Added disconnect option to camel-mail.
........
Added:
camel/branches/camel-2.8.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
- copied unchanged from r1195144, camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java?rev=1201850&r1=1201849&r2=1201850&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java (original)
+++ camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java Mon Nov 14 19:44:37 2011
@@ -62,6 +62,7 @@ public class MailConfiguration implement
private String alternativeBodyHeader = MailConstants.MAIL_ALTERNATIVE_BODY;
private boolean useInlineAttachments;
private boolean ignoreUnsupportedCharset;
+ private boolean disconnect;
public MailConfiguration() {
}
@@ -462,4 +463,12 @@ public class MailConfiguration implement
public void setIgnoreUnsupportedCharset(boolean ignoreUnsupportedCharset) {
this.ignoreUnsupportedCharset = ignoreUnsupportedCharset;
}
+
+ public boolean isDisconnect() {
+ return disconnect;
+ }
+
+ public void setDisconnect(boolean disconnect) {
+ this.disconnect = disconnect;
+ }
}
Modified: camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java?rev=1201850&r1=1201849&r2=1201850&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java (original)
+++ camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java Mon Nov 14 19:44:37 2011
@@ -137,6 +137,19 @@ public class MailConsumer extends Schedu
}
}
+ // should we disconnect, the header can override the configuration
+ boolean disconnect = getEndpoint().getConfiguration().isDisconnect();
+ if (disconnect) {
+ LOG.debug("Disconnecting from {}", getEndpoint().getConfiguration().getMailStoreLogInformation());
+ try {
+ store.close();
+ } catch (Exception e) {
+ LOG.debug("Could not disconnect from {}: " + getEndpoint().getConfiguration().getMailStoreLogInformation(), e);
+ }
+ store = null;
+ folder = null;
+ }
+
return polledMessages;
}
@@ -368,7 +381,7 @@ public class MailConsumer extends Schedu
buffer.append(header.getName()).append("=").append(header.getValue()).append("\n");
}
if (buffer.length() > 0) {
- LOG.debug("Generating UID from the following:\n" + buffer);
+ LOG.trace("Generating UID from the following:\n {}", buffer);
uid = UUID.nameUUIDFromBytes(buffer.toString().getBytes()).toString();
}
} catch (MessagingException e) {