Author: ema Date: Thu Mar 7 08:32:01 2013 New Revision: 1453730 URL: http://svn.apache.org/r1453730 Log: Merged revisions 1453727 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................ r1453727 | ema | 2013-03-07 16:19:59 +0800 (Thu, 07 Mar 2013) | 16 lines Merged revisions 1453726 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ................ r1453726 | ema | 2013-03-07 16:18:33 +0800 (Thu, 07 Mar 2013) | 9 lines Merged revisions 1453725 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1453725 | ema | 2013-03-07 16:17:13 +0800 (Thu, 07 Mar 2013) | 1 line [CXF-4871]:fix the compile issue with jdk5 ........ ................ ................ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1453726 Merged /cxf/trunk:r1453725 Merged /cxf/branches/2.6.x-fixes:r1453727 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?rev=1453730&r1=1453729&r2=1453730&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java (original) +++ cxf/branches/2.5.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java Thu Mar 7 08:32:01 2013 @@ -359,7 +359,7 @@ public class WSDLToJavaContainer extends URI relativePath = parentFile.relativize(new URI(file.getPath())); String name = relativePath.toString().replace("\\", "/"); if (file.isDirectory()) { - if (!name.isEmpty()) { + if (!StringUtils.isEmpty(name)) { if (!name.endsWith("/")) { name += "/"; }
