You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/10/19 19:57:58 UTC
svn commit: r826736 - in /cxf/branches/2.2.x-fixes: ./
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/Messages.properties
Author: dkulp
Date: Mon Oct 19 17:57:57 2009
New Revision: 826736
URL: http://svn.apache.org/viewvc?rev=826736&view=rev
Log:
Merged revisions 826181 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r826181 | cschneider | 2009-10-17 02:25:55 -0400 (Sat, 17 Oct 2009) | 1 line
CXF-2476 Throw meaningfull exception instead of NullpointerException
........
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/JaxWsServiceFactoryBean.java
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/Messages.properties
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/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=826736&r1=826735&r2=826736&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Mon Oct 19 17:57:57 2009
@@ -50,6 +50,7 @@
import javax.xml.ws.soap.SOAPBinding;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.PackageUtils;
import org.apache.cxf.common.util.StringUtils;
@@ -183,6 +184,10 @@
@Override
public void setServiceClass(Class<?> serviceClass) {
+ if (serviceClass == null) {
+ Message message = new Message("SERVICECLASS_MUST_BE_SET", LOG);
+ throw new ServiceConstructionException(message);
+ }
setJaxWsImplementorInfo(new JaxWsImplementorInfo(serviceClass));
super.setServiceClass(getJaxWsImplementorInfo().getEndpointClass());
}
Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/Messages.properties?rev=826736&r1=826735&r2=826736&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/Messages.properties (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/Messages.properties Mon Oct 19 17:57:57 2009
@@ -28,3 +28,4 @@
SOAPBinding_MESSAGE_RPC= JAX-WS SOAPBinding annotation with Style of RPC found on method {0}. This is not supported.
INVALID_REQUEST_WRAPPER = @RequestWrapper class {0} is the same as the actual parameter {1}. This is likely not to work.
INVALID_RESPONSE_WRAPPER = @ResponseWrapper class {0} is the same as the actual return class {1}. This is likely not to work.
+SERVICECLASS_MUST_BE_SET = serviceClass must be set to a valid service interface or class
\ No newline at end of file