[cxf] branch 3.2.x-fixes updated: [CXF-7851]NullPointerException in cxf-java2ws-plugin with more than one attachWsdl=true

[ff...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
     new fbdb8b7  [CXF-7851]NullPointerException in cxf-java2ws-plugin with more than one attachWsdl=true
fbdb8b7 is described below

commit fbdb8b7117193b629101966db714cb1fa700cf4c
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu Sep 27 19:04:38 2018 +0800

    [CXF-7851]NullPointerException in cxf-java2ws-plugin with more than one attachWsdl=true
---
 .../src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
index c3c2abd..04ea566 100644
--- a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
+++ b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
@@ -468,7 +468,7 @@ public class Java2WSMojo extends AbstractMojo {
                 
                 boolean hasWsdlAttached = false;
                 for (Artifact a : project.getAttachedArtifacts()) {
-                    if ("wsdl".equals(a.getType()) && classifier.equals(a.getClassifier())) {
+                    if ("wsdl".equals(a.getType()) && classifier != null && classifier.equals(a.getClassifier())) {
                         hasWsdlAttached = true;
                     }
                 }