cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r908222 - in /cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support: JaxWsServiceFactoryBean.java Messages.properties
Date Tue, 09 Feb 2010 21:12:06 GMT
Author: dkulp
Date: Tue Feb  9 21:12:06 2010
New Revision: 908222

URL: http://svn.apache.org/viewvc?rev=908222&view=rev
Log:
[CXF-2663] Fix for null classes coming from XmlSeeAlso annotation.
Modified patch from Craig Tataryn applied

Modified:
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/Messages.properties

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=908222&r1=908221&r2=908222&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Tue Feb  9 21:12:06 2010
@@ -536,7 +536,14 @@
         
         if (xmlSeeAlsoAnno != null && xmlSeeAlsoAnno.value() != null) {
             for (int i = 0; i < xmlSeeAlsoAnno.value().length; i++) {
-                classes.add(xmlSeeAlsoAnno.value()[i]);
+                Class<?> value = xmlSeeAlsoAnno.value()[i];
+                if (value == null) {
+                    LOG.log(Level.WARNING, "XMLSEEALSO_NULL_CLASS", 
+                            new Object[] {getServiceClass().getName(), i});
+                } else {
+                    classes.add(value);
+                }
+                
             }
         }
         return classes;

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/Messages.properties?rev=908222&r1=908221&r2=908222&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/Messages.properties
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/Messages.properties
Tue Feb  9 21:12:06 2010
@@ -28,4 +28,5 @@
 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
+SERVICECLASS_MUST_BE_SET = serviceClass must be set to a valid service interface or class
+XMLSEEALSO_NULL_CLASS = A class listed in the XmlSeeAlso annotation of the service class
%s cannot be found on the classpath. Index: %d of XmlSeeAlso class list.



Mime
View raw message