Author: ay Date: Mon Mar 25 21:16:42 2013 New Revision: 1460899 URL: http://svn.apache.org/r1460899 Log: Merged revisions 1460889 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1460889 | ay | 2013-03-25 21:56:56 +0100 (Mon, 25 Mar 2013) | 9 lines Merged revisions 1460691 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1460691 | ay | 2013-03-25 15:46:53 +0100 (Mon, 25 Mar 2013) | 1 line [CXF-4922] NPE is thrown at EP creation when no service class specified and the provided wsdl not loaded ........ ........ Added: cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/service/ - copied from r1460889, cxf/branches/2.7.x-fixes/rt/core/src/test/java/org/apache/cxf/service/ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Propchange: cxf/branches/2.6.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties?rev=1460899&r1=1460898&r2=1460899&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties (original) +++ cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties Mon Mar 25 21:16:42 2013 @@ -34,5 +34,6 @@ JAXWS_ANNOTATION_FOUND=A JAX-WS Annotati XSD_VALIDATION_ERROR= Error in W3C XML Schema associated with service: {0} COULD_NOT_UNWRAP=Could not unwrap Operation {0} to match method "{1}" NO_WSDL_PROVIDED=WSDL is required for services created from class {0}, but no WSDL location specified. +NO_WSDL_NO_SERVICE_CLASS_PROVIDED=No valid WSDL {0} nor service class is specified. NO_FAULT_PART = Could not find a fault part for {0}. The fault message must have a single part. INVALID_BARE_METHOD= Method {0} is configured as BARE but there are more than one parameters with wrong @Webparam annotated or without @WebParam annotated. Modified: cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=1460899&r1=1460898&r2=1460899&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original) +++ cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Mon Mar 25 21:16:42 2013 @@ -536,8 +536,10 @@ public class ReflectionServiceFactoryBea if (isFromWsdl()) { buildServiceFromWSDL(wsdlurl); - } else { + } else if (getServiceClass() != null) { buildServiceFromClass(); + } else { + throw new ServiceConstructionException(new Message("NO_WSDL_NO_SERVICE_CLASS_PROVIDED", LOG, wsdlurl)); } if (isValidate()) {
