cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r948142 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Date Tue, 25 May 2010 18:05:25 GMT
Author: dkulp
Date: Tue May 25 18:05:24 2010
New Revision: 948142

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

........
  r946820 | dkulp | 2010-05-20 19:33:35 -0400 (Thu, 20 May 2010) | 3 lines
  
  Section 3.3 of JAX-WS spec states final and static methods are not
  WebMethods unless the @WebMethod annotation specifically says they
  should be.
........

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/support/JaxWsServiceConfiguration.java

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/support/JaxWsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=948142&r1=948141&r2=948142&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Tue May 25 18:05:24 2010
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxws.support;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.HashMap;
@@ -162,12 +163,14 @@ public class JaxWsServiceConfiguration e
             } else {
                 return Boolean.TRUE;
             }
-        } 
+        }
         if (method.getDeclaringClass().isInterface()) {
             return hasWebServiceAnnotation(method);
         }
         if (implInfo.getSEIClass() == null) {
-            return hasWebServiceAnnotation(method);
+            return hasWebServiceAnnotation(method)
+                && !Modifier.isFinal(method.getModifiers())
+                && !Modifier.isStatic(method.getModifiers());
         }
         return implInfo.getSEIClass().isAssignableFrom(method.getDeclaringClass());
     }



Mime
View raw message