Author: bago
Date: Mon Feb 25 02:28:58 2008
New Revision: 630792
URL: http://svn.apache.org/viewvc?rev=630792&view=rev
Log:
Minor fix in probably unused code. (we returned the short error instead of the
long one)
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPF.java
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPF.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPF.java?rev=630792&r1=630791&r2=630792&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPF.java
(original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPF.java Mon Feb
25 02:28:58 2008
@@ -27,7 +27,6 @@
import org.apache.james.jspf.core.Logger;
import org.apache.james.jspf.core.MacroExpand;
import org.apache.james.jspf.core.MacroExpandEnabled;
-import org.apache.james.jspf.core.SPF1Constants;
import org.apache.james.jspf.core.SPF1Record;
import org.apache.james.jspf.core.SPF1Utils;
import org.apache.james.jspf.core.SPFCheckEnabled;
@@ -101,7 +100,7 @@
// this should never happen at all. But anyway we will set the
// result to neutral. Safety first ..
log.error(exception.getMessage(),exception);
- result = SPF1Constants.NEUTRAL;
+ result = SPFErrorConstants.NEUTRAL_CONV;
}
session.setCurrentResultExpanded(result);
@@ -343,11 +342,11 @@
// if we already have a result we don't need to add further processing.
if (spfData.getCurrentResultExpanded() == null) {
- SPFChecker policyChecker = new PolicyChecker(getPolicies());
- SPFChecker recordChecker = new SPFRecordChecker();
-
- spfData.pushChecker(recordChecker);
- spfData.pushChecker(policyChecker);
+ SPFChecker policyChecker = new PolicyChecker(getPolicies());
+ SPFChecker recordChecker = new SPFRecordChecker();
+
+ spfData.pushChecker(recordChecker);
+ spfData.pushChecker(policyChecker);
}
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
