cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1458011 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
Date Mon, 18 Mar 2013 21:24:00 GMT
Author: sergeyb
Date: Mon Mar 18 21:24:00 2013
New Revision: 1458011

URL: http://svn.apache.org/r1458011
Log:
Merged revisions 1458005 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1458005 | sergeyb | 2013-03-18 21:17:49 +0000 (Mon, 18 Mar 2013) | 1 line
  
  Setting REST_MESSAGE exchange property at the top of JAXRSInInterceptor
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1458005

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java?rev=1458011&r1=1458010&r2=1458011&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
Mon Mar 18 21:24:00 2013
@@ -93,6 +93,7 @@ public class JAXRSInInterceptor extends 
             // it's a suspended invocation;
             return;
         }
+        message.getExchange().put(Message.REST_MESSAGE, Boolean.TRUE);
         
         try {
             processRequest(message);
@@ -250,7 +251,6 @@ public class JAXRSInInterceptor extends 
     private void setExchangeProperties(Message message, OperationResourceInfo ori, 
                                       MultivaluedMap<String, String> values,
                                       int numberOfResources) {
-        message.getExchange().put(Message.REST_MESSAGE, Boolean.TRUE);
         message.getExchange().put(OperationResourceInfo.class, ori);
         message.put(RESOURCE_METHOD, ori.getMethodToInvoke());
         message.put(URITemplate.TEMPLATE_PARAMETERS, values);



Mime
View raw message