cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1539029 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
Date Tue, 05 Nov 2013 15:25:30 GMT
Author: sergeyb
Date: Tue Nov  5 15:25:30 2013
New Revision: 1539029

URL: http://svn.apache.org/r1539029
Log:
Merged revisions 1539024 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1539024 | sergeyb | 2013-11-05 15:17:04 +0000 (Tue, 05 Nov 2013) | 1 line
  
  [CXF-5355] Making sure substitutions do not interfere with xsi:type
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1539024

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

Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=1539029&r1=1539028&r2=1539029&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
Tue Nov  5 15:25:30 2013
@@ -404,9 +404,11 @@ public class WadlGenerator implements Re
                 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