cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1438255 - in /cxf/branches/2.6.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
Date Thu, 24 Jan 2013 23:02:28 GMT
Author: sergeyb
Date: Thu Jan 24 23:02:27 2013
New Revision: 1438255

URL: http://svn.apache.org/viewvc?rev=1438255&view=rev
Log:
Merged revisions 1438252 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

................
  r1438252 | sergeyb | 2013-01-24 22:58:14 +0000 (Thu, 24 Jan 2013) | 9 lines
  
  Merged revisions 1438251 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1438251 | sergeyb | 2013-01-24 22:54:33 +0000 (Thu, 24 Jan 2013) | 1 line
    
    Minor updates to JAXRSInInterceptor
  ........
................

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

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.7.x-fixes:r1438252
  Merged /cxf/trunk:r1438251

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

Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java?rev=1438255&r1=1438254&r2=1438255&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
Thu Jan 24 23:02:27 2013
@@ -56,7 +56,8 @@ public class JAXRSInInterceptor extends 
 
     private static final Logger LOG = LogUtils.getL7dLogger(JAXRSInInterceptor.class);
     private static final ResourceBundle BUNDLE = BundleUtils.getBundle(JAXRSInInterceptor.class);
-    
+    private static final String RESOURCE_METHOD = "org.apache.cxf.resource.method";
+    private static final String RESOURCE_OPERATION_NAME = "org.apache.cxf.resource.operation.name";
     public JAXRSInInterceptor() {
         super(Phase.UNMARSHAL);
     }
@@ -251,8 +252,9 @@ public class JAXRSInInterceptor extends 
     private void setExchangeProperties(Message message, OperationResourceInfo ori, 
                                       MultivaluedMap<String, String> values,
                                       int numberOfResources) {
+        message.put(Message.REST_MESSAGE, Boolean.TRUE);
         message.getExchange().put(OperationResourceInfo.class, ori);
-        message.put("org.apache.cxf.resource.method", ori.getMethodToInvoke());
+        message.put(RESOURCE_METHOD, ori.getMethodToInvoke());
         message.put(URITemplate.TEMPLATE_PARAMETERS, values);
         
         String plainOperationName = ori.getMethodToInvoke().getName();
@@ -260,7 +262,7 @@ public class JAXRSInInterceptor extends 
             plainOperationName = ori.getClassResourceInfo().getServiceClass().getSimpleName()
                 + "#" + plainOperationName;
         }
-        message.getExchange().put("org.apache.cxf.resource.operation.name", plainOperationName);
+        message.getExchange().put(RESOURCE_OPERATION_NAME, plainOperationName);
         
         boolean oneway = ori.isOneway() 
             || MessageUtils.isTrue(HttpUtils.getProtocolHeader(message, Message.ONE_WAY_REQUEST,
null));



Mime
View raw message