Author: klape Date: 2013-04-17 15:39:50 -0400 (Wed, 17 Apr 2013) New Revision: 17506 Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java Log: [JBPAPP-10687] Avoid NullPointerException when spring bean is not annotated with @WebService or @WebServiceProvider Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2013-04-17 07:16:51 UTC (rev 17505) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2013-04-17 19:39:50 UTC (rev 17506) @@ -248,7 +248,7 @@ wl = epIfWsa.wsdlLocation(); } } - } else { + } else if (clazz.isAnnotationPresent(WebServiceProvider.class)) { WebServiceProvider wsp = clazz.getAnnotation(WebServiceProvider.class); wl = wsp.wsdlLocation(); }