Author: sergeyb
Date: Wed Apr 27 16:54:31 2011
New Revision: 1097179
URL: http://svn.apache.org/viewvc?rev=1097179&view=rev
Log:
Merged revisions 1097178 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1097178 | sergeyb | 2011-04-27 17:53:49 +0100 (Wed, 27 Apr 2011) | 1 line
Removing temp comments
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 27 16:54:31 2011
@@ -1 +1 @@
-/cxf/trunk:1094926,1094992,1095349,1095666,1097071,1097175
+/cxf/trunk:1094926,1094992,1095349,1095666,1097071,1097175,1097178
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java?rev=1097179&r1=1097178&r2=1097179&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
Wed Apr 27 16:54:31 2011
@@ -144,9 +144,8 @@ public class JAXRSInvoker extends Abstra
}
- Method methodToInvoke = cri.getMethodDispatcher().getMethod(ori);
- //InjectionUtils.checkProxy(
- // cri.getMethodDispatcher().getMethod(ori), resourceObject);
+ Method methodToInvoke = InjectionUtils.checkProxy(
+ cri.getMethodDispatcher().getMethod(ori), resourceObject);
List<Object> params = null;
if (request instanceof List) {
