cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r829215 - in /cxf/branches/2.1.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
Date Fri, 23 Oct 2009 20:38:53 GMT
Author: dkulp
Date: Fri Oct 23 20:38:52 2009
New Revision: 829215

URL: http://svn.apache.org/viewvc?rev=829215&view=rev
Log:
Merged revisions 826736 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

................
  r826736 | dkulp | 2009-10-19 13:57:57 -0400 (Mon, 19 Oct 2009) | 9 lines
  
  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.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/Messages.properties

Propchange: cxf/branches/2.1.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=829215&r1=829214&r2=829215&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Fri Oct 23 20:38:52 2009
@@ -52,6 +52,7 @@
 
 import org.apache.cxf.binding.AbstractBindingFactory;
 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;
@@ -171,6 +172,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.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/Messages.properties?rev=829215&r1=829214&r2=829215&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/Messages.properties
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/Messages.properties
Fri Oct 23 20:38:52 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



Mime
View raw message