Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A682910FA6 for ; Tue, 5 Nov 2013 15:17:41 +0000 (UTC) Received: (qmail 45738 invoked by uid 500); 5 Nov 2013 15:17:34 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 45594 invoked by uid 500); 5 Nov 2013 15:17:29 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 45587 invoked by uid 99); 5 Nov 2013 15:17:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Nov 2013 15:17:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Nov 2013 15:17:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B62C62388994; Tue, 5 Nov 2013 15:17:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131105151704.B62C62388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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> 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); }