Dan, thanks for the fix, I actually did not include the local CORS update, sorry
Sergey

On 27/03/13 20:47, dk...@apache.org wrote:
Author: dkulp
Date: Wed Mar 27 17:47:25 2013
New Revision: 1461738

URL: http://svn.apache.org/r1461738
Log:
Fix tests by allowing for the null return.

Modified:
     
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java

Modified: 
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java?rev=1461738&r1=1461737&r2=1461738&view=diff
==============================================================================
--- 
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
 (original)
+++ 
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
 Wed Mar 27 17:47:25 2013
@@ -491,10 +491,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;




--
Sergey Beryozkin

Talend Community Coders
http://coders.talend.com/

Blog: http://sberyozkin.blogspot.com

Reply via email to