Author: dkulp
Date: Tue Feb 9 23:35:18 2010
New Revision: 908282
URL: http://svn.apache.org/viewvc?rev=908282&view=rev
Log:
Merged revisions 908222 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r908222 | dkulp | 2010-02-09 16:12:06 -0500 (Tue, 09 Feb 2010) | 2 lines
[CXF-2663] Fix for null classes coming from XmlSeeAlso annotation.
Modified patch from Craig Tataryn applied
........
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=908282&r1=908281&r2=908282&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
Tue Feb 9 23:35:18 2010
@@ -528,7 +528,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/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=908282&r1=908281&r2=908282&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
Tue Feb 9 23:35:18 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.
