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 2017/03/30 22:14:45 UTC
[3/4] cxf git commit: [CXF-6894] prevent NPE if request uses
anonymous types
[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/6f77d2f5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6f77d2f5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6f77d2f5
Branch: refs/heads/3.1.x-fixes
Commit: 6f77d2f5480a9c8b7f94f016467d12ea70d754c9
Parents: c22db8e
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:14:35 2017 -0400
----------------------------------------------------------------------
.../jaxws/validator/WrapperStyleNameCollisionValidator.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f77d2f5/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 5d3b700..dfe1a85 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 {