You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2018/02/05 21:00:41 UTC

[camel] 01/02: camel-mail: use multi-catch where possible

This is an automated email from the ASF dual-hosted git repository.

pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 097bb141a0608ee551fe74890668e16d821c770f
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Mon Feb 5 21:55:14 2018 +0100

    camel-mail: use multi-catch where possible
---
 .../src/main/java/org/apache/camel/component/mail/MailMessage.java    | 4 +---
 .../src/main/java/org/apache/camel/component/mail/MailProducer.java   | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
index 9119d98..2952563 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
@@ -116,9 +116,7 @@ public class MailMessage extends DefaultMessage {
                 if (binding != null) {
                     map.putAll(binding.extractHeadersFromMail(mailMessage, getExchange()));
                 }
-            } catch (MessagingException e) {
-                throw new RuntimeCamelException("Error accessing headers due to: " + e.getMessage(), e);
-            } catch (IOException e) {
+            } catch (MessagingException | IOException e) {
                 throw new RuntimeCamelException("Error accessing headers due to: " + e.getMessage(), e);
             }
         }
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java
index 5eb5dc2..e755122 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java
@@ -63,9 +63,7 @@ public class MailProducer extends DefaultProducer {
             sender.send(mimeMessage);
             // set the message ID for further processing
             exchange.getIn().setHeader(MailConstants.MAIL_MESSAGE_ID, mimeMessage.getMessageID());
-        } catch (MessagingException e) {
-            exchange.setException(e);
-        } catch (IOException e) {
+        } catch (MessagingException | IOException e) {
             exchange.setException(e);
         } finally {
             Thread.currentThread().setContextClassLoader(tccl);

-- 
To stop receiving notification emails like this one, please contact
pascalschumacher@apache.org.