Return-Path: 
 <scm-return-7059-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 89219 invoked from network); 15 Jul 2005 22:59:39 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 15 Jul 2005 22:59:39 -0000
Received: (qmail 44905 invoked by uid 500); 15 Jul 2005 22:59:38 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 44886 invoked by uid 500); 15 Jul 2005 22:59:37 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 44873 invoked by uid 99); 15 Jul 2005 22:59:37 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jul 2005 15:59:37 -0700
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Fri, 15 Jul 2005 15:59:35 -0700
Received: (qmail 89210 invoked by uid 65534); 15 Jul 2005 22:59:36 -0000
Message-ID: <20050715225936.89209.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r219254 -
 /geronimo/trunk/specs/javamail/src/java/javax/mail/internet/ParameterList.java
Date: Fri, 15 Jul 2005 22:59:36 -0000
To: scm@geronimo.apache.org
From: dims@apache.org
X-Mailer: svnmailer-1.0.2
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: dims
Date: Fri Jul 15 15:59:35 2005
New Revision: 219254

URL: http://svn.apache.org/viewcvs?rev=219254&view=rev
Log:
Fix parsing problem GERONIMO-764

Modified:
    geronimo/trunk/specs/javamail/src/java/javax/mail/internet/ParameterList.java

Modified: geronimo/trunk/specs/javamail/src/java/javax/mail/internet/ParameterList.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/specs/javamail/src/java/javax/mail/internet/ParameterList.java?rev=219254&r1=219253&r2=219254&view=diff
==============================================================================
--- geronimo/trunk/specs/javamail/src/java/javax/mail/internet/ParameterList.java (original)
+++ geronimo/trunk/specs/javamail/src/java/javax/mail/internet/ParameterList.java Fri Jul 15 15:59:35 2005
@@ -23,14 +23,14 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.StringTokenizer;
-
-// Represents lists in things like
+import java.util.List;
+import java.util.ArrayList;// Represents lists in things like
 // Content-Type: text/plain;charset=klingon
 //
 // The ;charset=klingon is the parameter list, may have more of them with ';'
 
 /**
- * @version $Rev$ $Date$
+ * @version $Rev: 179695 $ $Date: 2005-06-02 21:45:02 -0400 (Thu, 02 Jun 2005) $
  */
 public class ParameterList {
     private Map _parameters = new HashMap();
@@ -42,9 +42,9 @@
         if (list == null) {
             return;
         } else {
-            StringTokenizer tokenizer = new StringTokenizer(list, ";");
-            while (tokenizer.hasMoreTokens()) {
-                String parameter = tokenizer.nextToken();
+            String[] tokens = split(list,';');
+            for (int i=0;tokens != null && i<tokens.length;i++) {
+                String parameter = tokens[i];
                 int eq = parameter.indexOf("=");
                 if (eq == -1) {
                     throw new ParseException(parameter);
@@ -93,6 +93,47 @@
         }
         return result.toString();
         // TODO Return in same list as parsed format
+    }
+
+    public static String[] split(String str, char separatorChar) {
+        if (str == null) {
+            return null;
+        }
+        int len = str.length();
+        if (len == 0) {
+            return new String[0];
+        }
+        List list = new ArrayList();
+        int i = 0, start = 0;
+        boolean match = false;
+        while (i < len) {
+            char ch = str.charAt(i);
+            // Skip any separatorChar within quotes
+            if(ch == '\"') {
+                i++;
+                while(i < len && str.charAt(i) != '\"'){
+                    i++;
+                }
+                if(i < len){
+                    i++;
+                    continue;
+                }
+            }
+            if (ch == separatorChar) {
+                if (match) {
+                    list.add(str.substring(start, i));
+                    match = false;
+                }
+                start = ++i;
+                continue;
+            }
+            match = true;
+            i++;
+        }
+        if (match) {
+            list.add(str.substring(start, i));
+        }
+        return (String[]) list.toArray(new String[list.size()]);
     }
 
     public String toString(int lineBreak) {