cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject git commit: Update to JAXRS RequestPreprocessor to use 1.1 API
Date Wed, 30 Jul 2014 19:38:18 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 211c15f45 -> f34ea2c8d


Update to JAXRS RequestPreprocessor to use 1.1 API


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

Branch: refs/heads/3.0.x-fixes
Commit: f34ea2c8d96f88c41420ec9b851240cd7197def3
Parents: 211c15f
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Wed Jul 30 22:36:28 2014 +0300
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Wed Jul 30 22:37:42 2014 +0300

----------------------------------------------------------------------
 .../java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f34ea2c8/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java
index d9fa6fb..1a9e00f 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java
@@ -147,7 +147,10 @@ public class RequestPreprocessor {
                               HttpHeaders headers) {
         String method = queries.getFirst(METHOD_QUERY);
         if (method == null) {
-            method = headers.getHeaderString(METHOD_HEADER);
+            List<String> list = headers.getRequestHeader(METHOD_HEADER);
+            if (list != null && list.size() == 1) {
+                method = list.get(0);
+            }
         }
         if (method != null) {
             m.put(Message.HTTP_REQUEST_METHOD, method);


Mime
View raw message