You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/05/04 21:53:51 UTC
svn commit: r1334143 - in /cxf/branches/2.5.x-fixes: ./
maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
Author: dkulp
Date: Fri May 4 19:53:51 2012
New Revision: 1334143
URL: http://svn.apache.org/viewvc?rev=1334143&view=rev
Log:
Merged revisions 1334142 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1334142 | dkulp | 2012-05-04 15:53:02 -0400 (Fri, 04 May 2012) | 1 line
Fix possible NPE
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1334142
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java?rev=1334143&r1=1334142&r2=1334143&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java (original)
+++ cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java Fri May 4 19:53:51 2012
@@ -174,8 +174,10 @@ public class WSDL2JavaMojo extends Abstr
protected List<String> generateCommandLine(GenericWsdlOption wsdlOption)
throws MojoExecutionException {
List<String> ret = super.generateCommandLine(wsdlOption);
- ret.add(0, "-encoding");
- ret.add(1, encoding);
+ if (encoding != null) {
+ ret.add(0, "-encoding");
+ ret.add(1, encoding);
+ }
return ret;
}