cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1524199 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
Date Tue, 17 Sep 2013 20:02:42 GMT
Author: sergeyb
Date: Tue Sep 17 20:02:41 2013
New Revision: 1524199

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

........
  r1524195 | sergeyb | 2013-09-17 20:55:48 +0100 (Tue, 17 Sep 2013) | 1 line
  
  [CXF-5285] Always returning a modifiable map from WSDLGenerator getLocationsMap
........

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:r1524195

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=1524199&r1=1524198&r2=1524199&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 Sep 17 20:02:41 2013
@@ -1399,11 +1399,12 @@ public class WadlGenerator implements Re
                                                     UriInfo ui) {
             Map<String, String> nsMap = Collections.singletonMap("xs", XmlSchemaConstants.XSD_NAMESPACE_URI);
             String[] locations = source.getValues("/*/xs:" + elementName + "/@schemaLocation",
nsMap);
+
+            Map<String, String> locs = new HashMap<String, String>();
             if (locations == null) {
-                return Collections.emptyMap();
+                return locs;
             }
 
-            Map<String, String> locs = new HashMap<String, String>();
             for (String loc : locations) {
                 try {
                     URI uri = URI.create(loc);



Mime
View raw message