You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2004/10/15 01:44:53 UTC
cvs commit: ws-axis/java/src/org/apache/axis/wsdl/toJava JavaGeneratorFactory.java
dims 2004/10/14 16:44:53
Modified: java/src/org/apache/axis/wsdl/toJava
JavaGeneratorFactory.java
Log:
Fix for AXIS-1522 - JavaGeneratorFactory should not perform collision protection for types that are in excluded namespaces
from Ian P. Springer (ian.springer@hp.com)
Revision Changes Path
1.57 +2 -1 ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
Index: JavaGeneratorFactory.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- JavaGeneratorFactory.java 2 Sep 2004 12:15:59 -0000 1.56
+++ JavaGeneratorFactory.java 14 Oct 2004 23:44:53 -0000 1.57
@@ -623,7 +623,8 @@
typeQName = new QName(typeQName.getNamespaceURI(),
localName);
- if (emitter.isTypeCollisionProtection()) {
+ if (emitter.isTypeCollisionProtection() &&
+ !emitter.getNamespaceExcludes().contains(new NamespaceSelector(typeQName.getNamespaceURI()))) {
// If there is already an existing type,
// there will be a collision.
// If there is an existing anon type,