svn commit: r1349539 - /tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java

[kkolinko]

Author: kkolinko
Date: Tue Jun 12 21:19:50 2012
New Revision: 1349539

URL: http://svn.apache.org/viewvc?rev=1349539&view=rev
Log:
For https://issues.apache.org/bugzilla/show_bug.cgi?id=50182
Review of r1349477:
use more simple code when converting a list of mime types into array and ignore 
empty strings.

Modified:
    
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java

Modified: 
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java?rev=1349539&r1=1349538&r2=1349539&view=diff
==============================================================================
--- 
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
 (original)
+++ 
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
 Tue Jun 12 21:19:50 2012
@@ -17,7 +17,9 @@
 package compressionFilters;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.List;
 import java.util.StringTokenizer;
 
 import javax.servlet.Filter;
@@ -115,11 +117,21 @@ public class CompressionFilter implement
 
             str = filterConfig.getInitParameter("compressionMimeTypes");
             if (str!=null) {
-                compressionMimeTypes = null;
+                List<String> values = new ArrayList<String>();
                 StringTokenizer st = new StringTokenizer(str, ",");
 
                 while (st.hasMoreTokens()) {
-                    compressionMimeTypes = 
addStringArray(compressionMimeTypes, st.nextToken().trim());
+                    String token = st.nextToken().trim();
+                    if (token.length() > 0) {
+                        values.add(token);
+                    }
+                }
+
+                if (values.size() > 0) {
+                    compressionMimeTypes = values.toArray(
+                            new String[values.size()]);
+                } else {
+                    compressionMimeTypes = null;
                 }
 
                 if (debug > 0) {
@@ -250,26 +262,5 @@ public class CompressionFilter implement
         return config;
     }
 
-    /**
-     * General use method
-     *
-     * @param sArray the StringArray
-     * @param value string
-     */
-    private String[] addStringArray(String sArray[], String value) {
-        String[] result = null;
-        if (sArray == null) {
-            result = new String[1];
-            result[0] = value;
-        }
-        else {
-            result = new String[sArray.length + 1];
-            for (int i = 0; i < sArray.length; i++)
-                result[i] = sArray[i];
-            result[sArray.length] = value;
-        }
-        return result;
-    }
-
 }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org