Author: kishanthan
Date: Sat Jan 25 22:16:59 2014
New Revision: 1561414

URL: http://svn.apache.org/r1561414
Log:
fixing test failures in adb-codegen module w.r.t latest changes in 
xmlschema-core dependency, using IdentityHashMap to store 
processedAnonymousComplexTypes in SchemaCompiler

Modified:
    
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java

Modified: 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=1561414&r1=1561413&r2=1561414&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
 Sat Jan 25 22:16:59 2014
@@ -83,6 +83,7 @@ import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -111,7 +112,9 @@ public class SchemaCompiler {
     //the list of processedElements for the outer elements
     private HashMap<QName, String> processedElementMap;
 
-    private HashMap<XmlSchemaElement, BeanWriterMetaInfoHolder> 
processedAnonymousComplexTypesMap;
+    //need to use IdentityHashMap to store processedAnonymousComplexTypes
+    //because the key used with the map, XmlSchemaElement, is not immutable
+    private IdentityHashMap<XmlSchemaElement, BeanWriterMetaInfoHolder> 
processedAnonymousComplexTypesMap;
 
     //we need this map to keep the referenced elements. these elements need to 
be kept seperate
     //to avoid conflicts
@@ -211,7 +214,7 @@ public class SchemaCompiler {
         processedElementMap = new HashMap<QName, String>();
         simpleTypesMap = new HashMap<QName, String>();
         processedElementList = new ArrayList<QName>();
-        processedAnonymousComplexTypesMap = new HashMap<XmlSchemaElement, 
BeanWriterMetaInfoHolder>();
+        processedAnonymousComplexTypesMap = new 
IdentityHashMap<XmlSchemaElement, BeanWriterMetaInfoHolder>();
         changedTypeMap = new HashMap<QName, QName>();
         processedTypeMetaInfoMap = new HashMap<QName, 
BeanWriterMetaInfoHolder>();
         processedElementRefMap = new HashMap<QName, String>();


Reply via email to