Author: norman
Date: Sat Nov 18 04:51:18 2006
New Revision: 476512
URL: http://svn.apache.org/viewvc?view=rev&rev=476512
Log:
Minor improvement
Modified:
james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/AbstractJunkHandler.java
Modified:
james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/AbstractJunkHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/AbstractJunkHandler.java?view=diff&rev=476512&r1=476511&r2=476512
==============================================================================
---
james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/AbstractJunkHandler.java
(original)
+++
james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/AbstractJunkHandler.java
Sat Nov 18 04:51:18 2006
@@ -30,9 +30,7 @@
import org.apache.james.util.junkscore.JunkScoreConfigUtil;
/**
- * TODO: Should we split this class ?
- * Or maybe add a Handler which loads other handlers ?
- *
+ *
*/
public abstract class AbstractJunkHandler extends AbstractLogEnabled
implements Configurable {
private String action = "reject";
@@ -99,15 +97,18 @@
*/
protected void doProcessing(SMTPSession session) {
if (check(session)) {
+ JunkHandlerData data = getJunkHandlerData(session);
+
if (getAction().equals(JunkScoreConfigUtil.JUNKSCORE)) {
getLogger().info(getJunkHandlerData(session).getJunkScoreLogString());
JunkScore junk = getJunkScore(session);
-
junk.setStoredScore(getJunkHandlerData(session).getScoreName(), getScore());
+
+ junk.setStoredScore(data.getScoreName(), getScore());
} else {
- String response =
getJunkHandlerData(session).getRejectResponseString();
+ String response = data.getRejectResponseString();
- if (getJunkHandlerData(session).getRejectLogString() != null)
getLogger().info(getJunkHandlerData(session).getRejectLogString());
+ if (data.getRejectLogString() != null)
getLogger().info(data.getRejectLogString());
session.writeResponse(response);
// After this filter match we should not call any other
handler!
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
