svn commit: r1560923 - in /cxf/branches/2.7.x-fixes: api/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java

[ashakirin]

Author: ashakirin
Date: Fri Jan 24 09:01:17 2014
New Revision: 1560923

URL: http://svn.apache.org/r1560923
Log:
Fixed compatibility issue in AbstractInvoker.adjustMethodAndParams()

Modified:
    
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
    
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java

Modified: 
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java?rev=1560923&r1=1560922&r2=1560923&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
 Fri Jan 24 09:01:17 2014
@@ -78,6 +78,13 @@ public abstract class AbstractInvoker im
         }
     }
 
+    // Kept for compatibility reasons
+    protected Method adjustMethodAndParams(Method m,
+                                           Exchange ex,
+                                           List<Object> params) {
+        return adjustMethodAndParams(m, ex, params, null);
+    }
+
     protected Method adjustMethodAndParams(Method m,
                                            Exchange ex,
                                            List<Object> params,

Modified: 
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java?rev=1560923&r1=1560922&r2=1560923&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java
 Fri Jan 24 09:01:17 2014
@@ -129,7 +129,7 @@ public abstract class AbstractJAXWSMetho
     }
     
     private Method getProviderServiceObjectMethod(Method m, Class<?> 
serviceObjectClass) {
-        if (!Provider.class.isAssignableFrom(serviceObjectClass)) {
+        if ((serviceObjectClass == null) || 
(!Provider.class.isAssignableFrom(serviceObjectClass))) {
             return m;
         }
         Class<?> currentSvcClass = serviceObjectClass;