james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r654253 - /james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/optional/Envelope.java
Date Wed, 07 May 2008 20:17:02 GMT
Author: rdonkin
Date: Wed May  7 13:17:01 2008
New Revision: 654253

URL: http://svn.apache.org/viewvc?rev=654253&view=rev
Log:
Envelope does not need to be a complete address.

Modified:
    james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/optional/Envelope.java

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/optional/Envelope.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/optional/Envelope.java?rev=654253&r1=654252&r2=654253&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/optional/Envelope.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/optional/Envelope.java Wed May
 7 13:17:01 2008
@@ -22,11 +22,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-
 import org.apache.jsieve.comparators.ComparatorUtils;
-import org.apache.jsieve.exception.InternetAddressException;
 import org.apache.jsieve.exception.SieveException;
 import org.apache.jsieve.mail.MailAdapter;
 import org.apache.jsieve.mail.SieveMailException;
@@ -69,27 +65,17 @@
     protected boolean match(String addressPart, String comparator,
             String matchType, String headerValue, String key)
             throws SieveException {
-        // Attempt to create a new InternetAddress object from the headerValue
-        // If this fails, the header either is not intended to contain a valid
-        // Internet Address or is corrupt. Either way, its an Exception!
-        String address = null;
-        try {
-            // address is a simple address; user@domain or user
-            address = new InternetAddress(headerValue).getAddress();
-        } catch (AddressException e) {
-            throw new InternetAddressException(e.getMessage());
-        }
 
         // Extract the part of the address we are matching on
         String matchAddress = null;
         if (addressPart.equals(":all"))
-            matchAddress = address;
+            matchAddress = headerValue;
         else {
             int localStart = 0;
             int localEnd = 0;
             int domainStart = 0;
-            int domainEnd = address.length();
-            int splitIndex = address.indexOf('@');
+            int domainEnd = headerValue.length();
+            int splitIndex = headerValue.indexOf('@');
             // If there is no domain part (-1), treat it as an empty String
             if (splitIndex == -1) {
                 localEnd = domainEnd;
@@ -98,8 +84,8 @@
                 localEnd = splitIndex;
                 domainStart = splitIndex + 1;
             }
-            matchAddress = (addressPart.equals(LOCALPART_TAG) ? address
-                    .substring(localStart, localEnd) : address.substring(
+            matchAddress = (addressPart.equals(LOCALPART_TAG) ? headerValue
+                    .substring(localStart, localEnd) : headerValue.substring(
                     domainStart, domainEnd));
         }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message