You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2004/04/21 20:24:38 UTC
cvs commit: ws-axis/java/src/org/apache/axis/wsdl/symbolTable SchemaUtils.java
dims 2004/04/21 11:24:38
Modified: java/src/org/apache/axis/wsdl/symbolTable SchemaUtils.java
Log:
Patch from Andrei.Iltchenko@nl.compuware.com
for http://issues.apache.org/bugzilla/show_bug.cgi?id=26548
Revision Changes Path
1.41 +6 -3 ws-axis/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java
Index: SchemaUtils.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- SchemaUtils.java 30 Mar 2004 11:36:02 -0000 1.40
+++ SchemaUtils.java 21 Apr 2004 18:24:38 -0000 1.41
@@ -590,9 +590,12 @@
}
}
} else {
- BooleanHolder forElement = new BooleanHolder();
- QName nodeName = Utils.getTypeQName(groupNode, forElement, false);
- TypeEntry type = symbolTable.getTypeEntry(nodeName, forElement.value);
+ QName nodeName = Utils.getNodeNameQName(groupNode);
+ QName nodeType = Utils.getTypeQName(groupNode, new BooleanHolder(), false);
+ // The value of the second argument is 'false' since global model group
+ // definitions are always represented by objects whose type is
+ // assignment compatible with 'org.apache.axis.wsdl.symbolTable.Type'.
+ TypeEntry type = symbolTable.getTypeEntry(nodeType, false);
if (type != null) {
v.add(new ElementDecl(type, nodeName));