Navigation

Changeset 218

Timestamp:

08/28/08 17:29:50 (3 months ago)

Author:

jfp

Message:

#69 Integrate fix from Juan Zamora

Files:

r123	r218
61	61	public boolean doFilter(Email input) throws FilterTreeFailureException, FilterTreeSuccesException {
62	62	List<Rcpt> rcptInMail = input.getRcpt();
63		boolean res;
	63	boolean res = false;
	64	boolean found = false;
64	65	if (orOperator) {
65	66	for (Iterator iterator = rcptInMail.iterator(); iterator.hasNext();) {
…	…
69	70	EmailAddress oneRcptToMatch = (EmailAddress) iter.next();
70	71	if (oneRcptToMatch.isEqual(oneRcptInMail)) {
71		~~res~~ = true;
	72	found = true;
72	73	break;
73	74	}
74	75	}
	76	if (found) {
	77	break;
	78	}
75	79	}
76
77		~~res = false;~~
78	80	} else {
79		for (Iterator iter = rcptToMatch.iterator(); iter.hasNext();) {
80		EmailAddress oneRcptToMatch = (EmailAddress) iter.next();
81		boolean found = false;
82		for (Iterator iterator = rcptInMail.iterator(); iterator.hasNext();) {
83		Rcpt element = (Rcpt) iterator.next();
84		EmailAddress oneRcptInMail = element.getEmailAddress();
	81	log.debug("Plugin: " + getPluginName() + " Start validating without orOperator");
	82	for (Iterator iterator = rcptInMail.iterator(); iterator.hasNext();) {
	83	Rcpt element = (Rcpt) iterator.next();
	84	EmailAddress oneRcptInMail = element.getEmailAddress();
	85	found = false;
	86	for (Iterator iter = rcptToMatch.iterator(); iter.hasNext();) {
	87	EmailAddress oneRcptToMatch = (EmailAddress) iter.next();
85	88	if (oneRcptToMatch.isEqual(oneRcptInMail)) {
86	89	found = true;
…	…
89	92	}
90	93	if (!found) {
91		~~res = false~~;
	94	break;
92	95	}
93	96	}
	97	}
	98	if (found) {
94	99	res = true;
95	100	}