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 CE1CD101E7 for ; Tue, 17 Sep 2013 19:56:23 +0000 (UTC) Received: (qmail 34064 invoked by uid 500); 17 Sep 2013 19:56:20 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 33943 invoked by uid 500); 17 Sep 2013 19:56:13 -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 33914 invoked by uid 99); 17 Sep 2013 19:56:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Sep 2013 19:56:12 +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, 17 Sep 2013 19:56:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 62A972388980; Tue, 17 Sep 2013 19:55:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1524195 - /cxf/trunk/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java Date: Tue, 17 Sep 2013 19:55:49 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130917195549.62A972388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Tue Sep 17 19:55:48 2013 New Revision: 1524195 URL: http://svn.apache.org/r1524195 Log: [CXF-5285] Always returning a modifiable map from WSDLGenerator getLocationsMap 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=1524195&r1=1524194&r2=1524195&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 Sep 17 19:55:48 2013 @@ -1456,11 +1456,12 @@ public class WadlGenerator implements Co UriInfo ui) { Map nsMap = Collections.singletonMap("xs", Constants.URI_2001_SCHEMA_XSD); String[] locations = source.getValues("/*/xs:" + elementName + "/@schemaLocation", nsMap); + + Map locs = new HashMap(); if (locations == null) { - return Collections.emptyMap(); + return locs; } - Map locs = new HashMap(); for (String loc : locations) { try { URI uri = URI.create(loc);