You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by cl...@apache.org on 2009/12/22 19:12:05 UTC
svn commit: r893255 - in /cxf/branches/2.2.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
Author: cleclerc
Date: Tue Dec 22 18:12:04 2009
New Revision: 893255
URL: http://svn.apache.org/viewvc?rev=893255&view=rev
Log:
Merged revisions 893250 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r893250 | cleclerc | 2009-12-22 19:05:45 +0100 (Tue, 22 Dec 2009) | 3 lines
[CXF-2541] JMX Per Operation ResponseTime not collected for JAX-RS services
AbstractClient : operation.name must be defined in the exchange, not in the message
ClientProxyImpl : define the invoked Method in the exchange to let the ClientFaultConverter (or equivalent) figure out whether it is an UNCHECKED_APPLICATION_FAULT or a CHECKED_APPLICATION_FAULT
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 22 18:12:04 2009
@@ -1 +1 @@
-/cxf/trunk:891375-891393,891452,891817,891827,891859,891945-891946,892056,892307,892360,892664,892890,892920,892953,892988,893011
+/cxf/trunk:891375-891393,891452,891817,891827,891859,891945-891946,892056,892307,892360,892664,892890,892920,892953,892988,893011,893250
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java?rev=893255&r1=893254&r2=893255&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java Tue Dec 22 18:12:04 2009
@@ -587,7 +587,7 @@
}
protected void setPlainOperationNameProperty(Message outMessage, String name) {
- outMessage.put("org.apache.cxf.resource.operation.name", name);
+ outMessage.getExchange().put("org.apache.cxf.resource.operation.name", name);
}
}
Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java?rev=893255&r1=893254&r2=893255&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java Tue Dec 22 18:12:04 2009
@@ -415,6 +415,7 @@
}
outMessage.setContent(OperationResourceInfo.class, ori);
setPlainOperationNameProperty(outMessage, ori.getMethodToInvoke().getName());
+ outMessage.getExchange().put(Method.class, ori.getMethodToInvoke());
boolean isForm = types.containsKey(ParameterType.FORM);
if (bodyIndex != -1 || isForm) {
outMessage.put("BODY_INDEX", bodyIndex);