From f21f8d8d7085d783d3718bae48462cce4d40c5c8 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 16 Jan 2011 15:41:15 +0000
Subject: [PATCH] Avoid NPEs Remove FindBugs warning

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1059587 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/naming/factory/SendMailFactory.java | 12 +++++++++---
 res/findbugs/filter-false-positives.xml             |  7 +++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/naming/factory/SendMailFactory.java b/java/org/apache/naming/factory/SendMailFactory.java
index 57e0d3571..16aeb7903 100644
--- a/java/org/apache/naming/factory/SendMailFactory.java
+++ b/java/org/apache/naming/factory/SendMailFactory.java
@@ -111,10 +111,16 @@ public class SendMailFactory implements ObjectFactory
                     MimeMessage message = new MimeMessage(
                         Session.getInstance(props));
                     try {
-                        String from = (String)ref.get("mail.from").getContent();
-                        message.setFrom(new InternetAddress(from));
+                        RefAddr fromAddr = ref.get("mail.from");
+                        String from = null;
+                        if (fromAddr != null) {
+                            from = (String)ref.get("mail.from").getContent();
+                        }
+                        if (from != null) {
+                            message.setFrom(new InternetAddress(from));
+                        }
                         message.setSubject("");
-                    } catch (Exception e) {}
+                    } catch (Exception e) {/*Ignore*/}
                     MimePartDataSource mds = new MimePartDataSource(message);
                     return mds;
                 }
diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml
index ed135693e..27d436837 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -49,6 +49,13 @@
     <Bug code="NS"/>
   </Match>
   <Match>
+    <!-- Simpler to catch Exception than to create dummy implementations of the
+         necessary exception hierarchy -->
+    <Class name="org.apache.naming.factory.SendMailFactory$1" />
+    <Method name="run" />
+    <Bug code="DE" />
+  </Match>
+  <Match>
     <!-- Class name needs to start with a lower case letter in this case -->
     <Class name="org.apache.naming.java.javaURLContextFactory" />
     <Bug code="Nm" />
-- 
2.11.0