Author: eric
Date: Tue Jul 17 18:44:04 2012
New Revision: 1362602
URL: http://svn.apache.org/viewvc?rev=1362602&view=rev
Log:
Guard against null sender (JAMES-1422)
Modified:
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
Modified:
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java?rev=1362602&r1=1362601&r2=1362602&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
(original)
+++
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
Tue Jul 17 18:44:04 2012
@@ -263,19 +263,21 @@ public class JamesMailetContext implemen
* @see
org.apache.mailet.MailetContext#isLocalEmail(org.apache.mailet.MailAddress)
*/
public boolean isLocalEmail(MailAddress mailAddress) {
- String userName = mailAddress.toString().toLowerCase();
- if (!isLocalServer(mailAddress.getDomain().toLowerCase())) {
- return false;
- }
- try {
- if (localusers.supportVirtualHosting() == false) {
- userName = mailAddress.getLocalPart().toLowerCase();
+ if (mailAddress != null) {
+ String userName = mailAddress.toString().toLowerCase();
+ if (!isLocalServer(mailAddress.getDomain().toLowerCase())) {
+ return false;
}
- return localusers.contains(userName);
+ try {
+ if (localusers.supportVirtualHosting() == false) {
+ userName = mailAddress.getLocalPart().toLowerCase();
+ }
+ return localusers.contains(userName);
- } catch (UsersRepositoryException e) {
- log("Unable to access UsersRepository", e);
+ } catch (UsersRepositoryException e) {
+ log("Unable to access UsersRepository", e);
+ }
}
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
