[jbossws-commits] JBossWS SVN: r17507 - in stack/cxf/branches/jbossws-cxf-3.1.2.SP13-JBPAPP-10701: modules/server/src/main/java/org/jboss/wsf/stack/cxf and 1 other directory.
Author: klape
Date: 2013-04-17 15:45:05 -0400 (Wed, 17 Apr 2013)
New Revision: 17507
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2.SP13-JBPAPP-10701/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
stack/cxf/branches/jbossws-cxf-3.1.2.SP13-JBPAPP-10701/pom.xml
Log:
[JBPAPP-10701] Fixing NullPointerException when spring bean has no @WebService or
@WebServiceProvider annotation
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2.SP13-JBPAPP-10701/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2.SP13-JBPAPP-10701/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2013-04-17
19:39:50 UTC (rev 17506)
+++
stack/cxf/branches/jbossws-cxf-3.1.2.SP13-JBPAPP-10701/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2013-04-17
19:45:05 UTC (rev 17507)
@@ -248,7 +248,7 @@
wl = epIfWsa.wsdlLocation();
}
}
- } else {
+ } else if (clazz.isAnnotationPresent(WebServiceProvider.class)) {
WebServiceProvider wsp =
clazz.getAnnotation(WebServiceProvider.class);
wl = wsp.wsdlLocation();
}
Modified: stack/cxf/branches/jbossws-cxf-3.1.2.SP13-JBPAPP-10701/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2.SP13-JBPAPP-10701/pom.xml 2013-04-17 19:39:50 UTC
(rev 17506)
+++ stack/cxf/branches/jbossws-cxf-3.1.2.SP13-JBPAPP-10701/pom.xml 2013-04-17 19:45:05 UTC
(rev 17507)
@@ -45,7 +45,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.1.0.SP9</jbossws.common.version>
- <jbossws.framework.version>3.1.2.SP12</jbossws.framework.version>
+ <jbossws.framework.version>3.1.2.SP13</jbossws.framework.version>
<jbossws.spi.version>1.1.2.SP8</jbossws.spi.version>
<!-- JBWS-2505 -->
<!-- START -->