You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by vi...@apache.org on 2004/02/26 14:41:02 UTC
cvs commit: james-server/src/java/org/apache/james/transport/matchers AbstractQuotaMatcher.java
vincenzo 2004/02/26 05:41:02
Modified: src/java/org/apache/james/transport/matchers Tag:
branch_2_1_fcs AbstractQuotaMatcher.java
Log:
AbstractQuotaMatcher subclasses currently check if the sender is the local Postmaster, and in such case the match fails, in order to make sure that such messages are always delivered.
The same behaviour is needed when the sender is null (better, when the reverse path is NULL: <>), meaning that the message is a Bounce.
Revision Changes Path
No revision
No revision
1.1.2.2 +20 -60 james-server/src/java/org/apache/james/transport/matchers/Attic/AbstractQuotaMatcher.java
Index: AbstractQuotaMatcher.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/matchers/Attic/AbstractQuotaMatcher.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AbstractQuotaMatcher.java 16 May 2003 05:24:58 -0000 1.1.2.1
+++ AbstractQuotaMatcher.java 26 Feb 2004 13:41:02 -0000 1.1.2.2
@@ -1,60 +1,19 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache", "Jakarta", "JAMES" and "Apache Software Foundation"
- * must not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
+/***********************************************************************
+ * Copyright (c) 2000-2004 The Apache Software Foundation. *
+ * All rights reserved. *
+ * ------------------------------------------------------------------- *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you *
+ * may not use this file except in compliance with the License. You *
+ * may obtain a copy of the License at: *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, software *
+ * distributed under the License is distributed on an "AS IS" BASIS, *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or *
+ * implied. See the License for the specific language governing *
+ * permissions and limitations under the License. *
+ ***********************************************************************/
package org.apache.james.transport.matchers;
@@ -72,7 +31,8 @@
* will be done by subclasses.</P>
* <P>Although extending GenericMatcher, its logic is recipient oriented.</P>
*
- * @version 1.0.0, 2003-05-11
+ * @version CVS $Revision$ $Date$
+ * @since 2.2.0
*/
abstract public class AbstractQuotaMatcher extends GenericMatcher {
@@ -121,14 +81,14 @@
/**
* Checks the sender.
- * The default behaviour is to check that the sender <I>is not</I> the local postmaster.
+ * The default behaviour is to check that the sender <I>is not</I> null nor the local postmaster.
* If a subclass overrides this method it should "and" <CODE>super.isSenderChecked</CODE>
* to its check.
*
* @param sender the sender to check
*/
protected boolean isSenderChecked(MailAddress sender) throws MessagingException {
- return !(getMailetContext().getPostmaster().equals(sender));
+ return !(sender == null || getMailetContext().getPostmaster().equals(sender));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org