cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1424979 - /cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Date Fri, 21 Dec 2012 15:43:30 GMT
Author: dkulp
Date: Fri Dec 21 15:43:29 2012
New Revision: 1424979

URL: http://svn.apache.org/viewvc?rev=1424979&view=rev
Log:
[CXF-4713] Grab all the methods
Patch from Iris Ding applied.

Modified:
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=1424979&r1=1424978&r2=1424979&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Fri Dec 21 15:43:29 2012
@@ -157,13 +157,15 @@ public class JaxWsServiceConfiguration e
             || method.isSynthetic()) {
             return Boolean.FALSE;
         }
+        
         WebMethod wm = method.getAnnotation(WebMethod.class);
-        if (wm != null) {
-            if (wm.exclude()) {
-                return Boolean.FALSE;
-            } else {
-                return Boolean.TRUE;
-            }
+        Class<?>  cls = method.getDeclaringClass();
+        if ((wm != null) && wm.exclude()) {
+            return Boolean.FALSE;
+        }
+        if ((wm != null && !wm.exclude()) || (cls.isInterface() 
+                && cls.isAssignableFrom(implInfo.getSEIClass()))) {
+            return Boolean.TRUE;
         }
         if (method.getDeclaringClass().isInterface()) {
             return hasWebServiceAnnotation(method);



Mime
View raw message