svn commit: r1461756 - /cxf/branches/2.7.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java

[dkulp]

Author: dkulp
Date: Wed Mar 27 18:05:20 2013
New Revision: 1461756

URL: http://svn.apache.org/r1461756
Log:
Merged revisions 1461738 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1461738 | dkulp | 2013-03-27 13:47:25 -0400 (Wed, 27 Mar 2013) | 2 lines

  Fix tests by allowing for the null return.

........

Modified:
    
cxf/branches/2.7.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java

Modified: 
cxf/branches/2.7.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java?rev=1461756&r1=1461755&r2=1461756&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
 Wed Mar 27 18:05:20 2013
@@ -474,10 +474,12 @@ public class CrossOriginResourceSharingF
             splitPattern = FIELD_COMMA_PATTERN;
         }
         List<String> results = new ArrayList<String>();
-        for (String value : values) {
-            String[] items = splitPattern.split(value);
-            for (String item : items) {
-                results.add(item.trim());
+        if (values != null) {
+            for (String value : values) {
+                String[] items = splitPattern.split(value);
+                for (String item : items) {
+                    results.add(item.trim());
+                }
             }
         }
         return results;