camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r735428 - in /activemq/camel/branches/camel-1.x: ./ components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
Date Sun, 18 Jan 2009 10:20:43 GMT
Author: davsclaus
Date: Sun Jan 18 02:20:42 2009
New Revision: 735428

URL: http://svn.apache.org/viewvc?rev=735428&view=rev
Log:
Merged revisions 735427 via svnmerge from 
https://svn.apache.org/repos/asf/activemq/camel/trunk

........
  r735427 | davsclaus | 2009-01-18 11:14:50 +0100 (Sun, 18 Jan 2009) | 1 line
  
  CAMEL-1263: Closing mailbox folder can cause MessagingException on some mail servers that
block the folder. This is now ignored and debug logged.
........

Modified:
    activemq/camel/branches/camel-1.x/   (props changed)
    activemq/camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 18 02:20:42 2009
@@ -1 +1 @@
-/activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130,734309,734340-734342,734348,734392,734422,734727,734903,734932,735421
+/activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130,734309,734340-734342,734348,734392,734422,734727,734903,734932,735421,735427

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: activemq/camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java?rev=735428&r1=735427&r2=735428&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
(original)
+++ activemq/camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
Sun Jan 18 02:20:42 2009
@@ -109,8 +109,13 @@
             }
         } finally {
             // need to ensure we release resources
-            if (folder.isOpen()) {
-                folder.close(true);
+            try {
+                if (folder.isOpen()) {
+                    folder.close(true);
+                }
+            } catch (MessagingException e) {
+                // some mail servers will lock the folder so we ignore in this case (CAMEL-1263)
+                LOG.debug("Could not close mailbox folder: " + folder.getName(), e);
             }
         }
     }



Mime
View raw message