cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1539024 - /cxf/trunk/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
Date Tue, 05 Nov 2013 15:17:04 GMT
Author: sergeyb
Date: Tue Nov  5 15:17:04 2013
New Revision: 1539024

URL: http://svn.apache.org/r1539024
Log:
[CXF-5355] Making sure substitutions do not interfere with xsi:type

Modified:
    cxf/trunk/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java

Modified: cxf/trunk/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=1539024&r1=1539023&r2=1539024&view=diff
==============================================================================
--- cxf/trunk/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
(original)
+++ cxf/trunk/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
Tue Nov  5 15:17:04 2013
@@ -389,8 +389,10 @@ public class WadlGenerator implements Co
                 XmlSeeAlso seeAlsoAnn = cls.getAnnotation(XmlSeeAlso.class);
                 if (seeAlsoAnn != null) {
                     List<Class<?>> seeAlsoList = CastUtils.cast(Arrays.asList(seeAlsoAnn.value()));
-                    for (Class<?> seeAlsoCls : seeAlsoList) {
-                        resourceTypes.getSubstitutions().put(seeAlsoCls, cls);
+                    if (this.supportJaxbSubstitutions) {
+                        for (Class<?> seeAlsoCls : seeAlsoList) {
+                            resourceTypes.getSubstitutions().put(seeAlsoCls, cls);
+                        }
                     }
                     extraClasses.addAll(seeAlsoList);
                 }



Mime
View raw message