cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6321] Post-match request filters can only be applied once to the final resource methods
Date Thu, 02 Apr 2015 11:14:56 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 401def618 -> 14deb388f


[CXF-6321] Post-match request filters can only be applied once to the final resource methods


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

Branch: refs/heads/2.7.x-fixes
Commit: 14deb388f81e4aea9ee8b0fb10b8ebfbc1202195
Parents: 401def6
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Thu Apr 2 11:36:32 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Thu Apr 2 12:14:19 2015 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java    | 8 +++++---
 .../apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java    | 9 +++++----
 2 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/14deb388/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
index 3f161fa..6304618 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
@@ -254,9 +254,11 @@ public class JAXRSInvoker extends AbstractInvoker {
                 exchange.put(OperationResourceInfo.class, subOri);
                 inMessage.put(URITemplate.TEMPLATE_PARAMETERS, values);
             
-                if (JAXRSUtils.runContainerRequestFilters(providerFactory,
-                                                      inMessage,
-                                                      false, subOri.getNameBindings())) {
+                if (!subOri.isSubResourceLocator()
+                    && JAXRSUtils.runContainerRequestFilters(providerFactory,
+                                                             inMessage,
+                                                             false, 
+                                                             subOri.getNameBindings())) {
                     return new MessageContentsList(exchange.get(Response.class));
                 }
                 

http://git-wip-us.apache.org/repos/asf/cxf/blob/14deb388/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
index a82890d..f1ba2ce 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
@@ -239,10 +239,11 @@ public class JAXRSInInterceptor extends AbstractPhaseInterceptor<Message>
{
         setExchangeProperties(message, ori, values, resources.size());
         
         // Global and name-bound post-match request filters
-        if (JAXRSUtils.runContainerRequestFilters(providerFactory,
-                                                  message,
-                                                  false, 
-                                                  ori.getNameBindings())) {
+        if (!ori.isSubResourceLocator()
+            && JAXRSUtils.runContainerRequestFilters(providerFactory,
+                                                      message,
+                                                      false, 
+                                                      ori.getNameBindings())) {
             return;
         }
         


Mime
View raw message