cxf git commit: [C[CXF-7256] CrossOriginResourceSharingFilter should have @Provider annotation, patch from Dennis Kieselhorst applied, This closes #239

[se...@apache.org]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes b2bad7f9e -> 5eeabb2bc


[C[CXF-7256] CrossOriginResourceSharingFilter should have @Provider annotation, patch from Dennis Kieselhorst applied, This closes #239


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5eeabb2b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5eeabb2b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5eeabb2b

Branch: refs/heads/3.1.x-fixes
Commit: 5eeabb2bcb79fd3cff7f0c095716f1808f4c41e8
Parents: b2bad7f
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Feb 20 21:28:42 2017 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Feb 20 21:33:58 2017 +0000

----------------------------------------------------------------------
 .../rs/security/cors/CrossOriginResourceSharingFilter.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/5eeabb2b/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java b/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
index bbe2b4f..990c089 100644
--- a/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
+++ b/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
@@ -43,6 +43,7 @@ import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
 
 import org.apache.cxf.common.util.ReflectionUtil;
 import org.apache.cxf.jaxrs.impl.MetadataMap;
@@ -70,6 +71,7 @@ import org.apache.cxf.phase.Phase;
  * </pre>
  * or unless the <tt>defaultOptionsMethodsHandlePreflight</tt> property of this class is set to <tt>true</tt>.
  */
+@Provider
 @PreMatching
 @Priority(Priorities.AUTHENTICATION - 1)
 public class CrossOriginResourceSharingFilter implements ContainerRequestFilter, 
@@ -165,10 +167,6 @@ public class CrossOriginResourceSharingFilter implements ContainerRequestFilter,
      * have additional headers based on what happens here.
      * 
      * @param m the incoming message.
-     * @param opResInfo 
-     * @param ann the annotation, if any, derived from a method that matched the OPTIONS request for the
-     *            preflight. probably completely useless.
-     * @param resourceClass the resource class passed into the filter.
      * @return
      */
     //CHECKSTYLE:OFF
@@ -486,8 +484,8 @@ public class CrossOriginResourceSharingFilter implements ContainerRequestFilter,
     /**
      * CORS uses one header containing space-separated values (Origin) and then
      * a raft of #field-name productions, which parse on commas and optional spaces.
-     * @param m
      * @param key
+     * @param spaceSeparated
      * @return
      */
     private List<String> getHeaderValues(String key, boolean spaceSeparated) {