Author: dkulp
Date: Tue Jul 24 17:16:33 2012
New Revision: 1365176
URL: http://svn.apache.org/viewvc?rev=1365176&view=rev
Log:
Merged revisions 1365174 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1365174 | dkulp | 2012-07-24 13:12:31 -0400 (Tue, 24 Jul 2012) | 3 lines
[CXF-4388] Wsdl options from artifacts only works if the artifact
versions are the first options in the list.
........
Modified:
cxf/branches/2.6.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
Modified:
cxf/branches/2.6.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java?rev=1365176&r1=1365175&r2=1365176&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
(original)
+++
cxf/branches/2.6.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
Tue Jul 24 17:16:33 2012
@@ -623,7 +623,7 @@ public abstract class AbstractCodegenMoh
for (GenericWsdlOption wsdlOption : effectiveWsdlOptions) {
WsdlArtifact wsdlA = wsdlOption.getArtifact();
if (wsdlA == null) {
- return;
+ continue;
}
Artifact wsdlArtifact =
artifactFactory.createBuildArtifact(wsdlA.getGroupId(),
wsdlA.getArtifactId(),
