This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-specs.git


The following commit(s) were added to refs/heads/master by this push:
     new eff6549  [SM-4352]: Fix server cannot start when using 
activation-api-1.2.1, because MimeType.isSpecial doesn't exist
     new 0e9b5b4  Merge pull request #17 from kh4mell/patch-1
eff6549 is described below

commit eff65493911f97786439fb75f57b1ba2759cdab3
Author: kh4mell <[email protected]>
AuthorDate: Thu Jul 16 14:59:35 2020 +0200

    [SM-4352]: Fix server cannot start when using activation-api-1.2.1, because 
MimeType.isSpecial doesn't exist
---
 .../src/main/java/javax/activation/MailcapCommandMap.java      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git 
a/activation-api-1.2.1/src/main/java/javax/activation/MailcapCommandMap.java 
b/activation-api-1.2.1/src/main/java/javax/activation/MailcapCommandMap.java
index a028635..536083f 100644
--- a/activation-api-1.2.1/src/main/java/javax/activation/MailcapCommandMap.java
+++ b/activation-api-1.2.1/src/main/java/javax/activation/MailcapCommandMap.java
@@ -41,6 +41,10 @@ import java.util.Map;
  * @version $Rev$ $Date$
  */
 public class MailcapCommandMap extends CommandMap {
+    /**
+     * A string that holds all the special chars.
+     */
+    private static final String TSPECIALS = "()<>@,;:/[]?=\\\"";
     private final Map mimeTypes = new HashMap();
     private final Map preferredCommands = new HashMap();
     private final Map allCommands = new HashMap();
@@ -310,7 +314,7 @@ public class MailcapCommandMap extends CommandMap {
     }
 
     private int getToken(String s, int index) {
-        while (index < s.length() && s.charAt(index) != '#' && 
!MimeType.isSpecial(s.charAt(index))) {
+        while (index < s.length() && s.charAt(index) != '#' && 
!isSpecialCharacter(s.charAt(index))) {
             index++;
         }
         return index;
@@ -504,4 +508,8 @@ public class MailcapCommandMap extends CommandMap {
         }
         return (String[])commands.toArray(new String[commands.size()]);
     }
+    
+    private boolean isSpecialCharacter(char c) {
+        return Character.isWhitespace(c) || Character.isISOControl(c) || 
TSPECIALS.indexOf(c) != -1;
+    }
 }

Reply via email to