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 2005/04/23 03:49:03 UTC
cvs commit: ws-axis/java/src/org/apache/axis/wsdl/toJava JavaGeneratorFactory.java
dims 2005/04/22 18:49:03
Modified: java/src/org/apache/axis/wsdl/toJava
JavaGeneratorFactory.java
Log:
fix typo and don't add empty vectors as collision candidates.
Revision Changes Path
1.67 +6 -6 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.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- JavaGeneratorFactory.java 21 Mar 2005 12:37:20 -0000 1.66
+++ JavaGeneratorFactory.java 23 Apr 2005 01:49:03 -0000 1.67
@@ -16,8 +16,6 @@
package org.apache.axis.wsdl.toJava;
import org.apache.axis.components.logger.LogFactory;
-import org.apache.axis.encoding.DefaultTypeMappingImpl;
-import org.apache.axis.encoding.TypeMapping;
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.Messages;
import org.apache.axis.wsdl.gen.Generator;
@@ -972,7 +970,7 @@
// Keep a list of anonymous types so we don't try to resolve them twice.
HashSet anonTypes = new HashSet();
- List collisionCanidates = new ArrayList(); // List of vector of SymbolTable entry
+ List collisionCandidates = new ArrayList(); // List of vector of SymbolTable entry
List localParts = new ArrayList(); // all localparts in all symboltable entries
for (Iterator i = symbolTable.getHashMap().keySet().iterator(); i.hasNext(); ) {
@@ -995,10 +993,12 @@
v.addAll((Vector)symbolTable.getHashMap().get(qName));
}
}
- collisionCanidates.add(v);
- }
+ if(v.size()>0) {
+ collisionCandidates.add(v);
+ }
+ }
}
- Iterator it = collisionCanidates.iterator();
+ Iterator it = collisionCandidates.iterator();
while (it.hasNext()) {
Vector v = new Vector(