[CXF-6894] prevent NPE if request uses anonymous types
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/57ccc2b5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/57ccc2b5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/57ccc2b5 Branch: refs/heads/3.0.x-fixes Commit: 57ccc2b552e0a780f82618ec270bc8d25d7b73ad Parents: 8783d92 Author: Daniel Kulp <dk...@apache.org> Authored: Thu Mar 30 16:40:34 2017 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Thu Mar 30 18:15:05 2017 -0400 ---------------------------------------------------------------------- .../jaxws/validator/WrapperStyleNameCollisionValidator.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/57ccc2b5/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java index aaecf44..4ddec6b 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java @@ -170,9 +170,11 @@ public class WrapperStyleNameCollisionValidator extends ServiceValidator { String mappedName = mapElementName(operation, operation.getUnwrappedOperation().getOutput(), element); + + QName mn = names.get(mappedName); if (names.containsKey(mappedName) - && !(names.get(mappedName) == element.getSchemaTypeName() - || names.get(mappedName).equals(element.getSchemaTypeName()))) { + && !(mn == element.getSchemaTypeName() + || (mn != null && mn.equals(element.getSchemaTypeName())))) { handleErrors(names.get(mappedName), element); return false; } else {
