Repository: cxf Updated Branches: refs/heads/master 6fd76780c -> 0dc7db7aa
[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/fe4c8b6e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fe4c8b6e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fe4c8b6e Branch: refs/heads/master Commit: fe4c8b6e94fd286473f8ca3b626f08cee50d2ee2 Parents: 408fe33 Author: Neal Hu <[email protected]> Authored: Fri Mar 31 17:54:17 2017 +0800 Committer: Neal Hu <[email protected]> Committed: Fri Mar 31 17:54:17 2017 +0800 ---------------------------------------------------------------------- .../jaxws/validator/WrapperStyleNameCollisionValidator.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/fe4c8b6e/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 40e4fe0..b23b48c 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 @@ -167,9 +167,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 {
