You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/06/29 21:54:41 UTC

svn commit: r789429 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java

Author: dkulp
Date: Mon Jun 29 19:54:41 2009
New Revision: 789429

URL: http://svn.apache.org/viewvc?rev=789429&view=rev
Log:
Merged revisions 789420 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r789420 | dkulp | 2009-06-29 15:44:04 -0400 (Mon, 29 Jun 2009) | 2 lines
  
  Use the Provider interface invoke method instead of the instance class
  specific version since the instance itself could end up being a proxy.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 29 19:54:41 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420

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

Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java?rev=789429&r1=789428&r2=789429&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java Mon Jun 29 19:54:41 2009
@@ -20,8 +20,8 @@
 package org.apache.cxf.jaxws;
 
 import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
+
+import javax.xml.ws.Provider;
 
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.frontend.MethodDispatcher;
@@ -35,18 +35,14 @@
     Method invoke;
     
     public JAXWSProviderMethodDispatcher(JaxWsImplementorInfo implInfo) {
-        Type[] genericInterfaces = implInfo.getImplementorClass().getGenericInterfaces();
-        ParameterizedType pt = (ParameterizedType)genericInterfaces[0];
-        Class c = (Class)pt.getActualTypeArguments()[0];
         try {
-            invoke = implInfo.getImplementorClass().getMethod("invoke", c);
+            invoke = Provider.class.getMethod("invoke", new Class[] {Object.class});
         } catch (Exception e) {
             throw new ServiceConstructionException(e);
         }
     }
 
     public BindingOperationInfo getBindingOperation(Method m, Endpoint endpoint) {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -55,7 +51,6 @@
     }
 
     public void bind(OperationInfo o, Method... methods) {
-        // TODO Auto-generated method stub
     }