svn commit: r171381 - /geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java

[gd...@apache.org]

Author: gdamour
Date: Sun May 22 16:05:46 2005
New Revision: 171381

URL: http://svn.apache.org/viewcvs?rev=171381&view=rev
Log:
Perform a lookup based on the typeQName of the ParameterDesc to retrieve
the associated SchemaType.

Also, do not fail if one cannot find the associated SchemaType. This is a
temporary fix.

Modified:
    geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java

Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java?rev=171381&r1=171380&r2=171381&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java (original)
+++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java Sun May 22 16:05:46 2005
@@ -146,6 +146,12 @@
             typeInfoList.add(internalTypeInfo.buildTypeInfo());
         }
         
+        Map qNameToKey = new HashMap();
+        for (Iterator iter = schemaTypeKeyToSchemaTypeMap.keySet().iterator(); iter.hasNext();) {
+            SchemaTypeKey key = (SchemaTypeKey) iter.next();
+            qNameToKey.put(key.getqName(), key);
+        }
+        
         for (Iterator iter = operations.iterator(); iter.hasNext();) {
             OperationDesc operationDesc = (OperationDesc) iter.next();
             ArrayList parameters = new ArrayList(operationDesc.getParameters());
@@ -157,13 +163,17 @@
                 QName typeQName = parameterDesc.getTypeQName();
                 if (mappedTypeQNames.contains(typeQName)) {
                     continue;
+                } else if (qnamesToFactoryPair.keySet().contains(typeQName)) {
+                    continue;
                 }
-
-                SchemaTypeKey key = new SchemaTypeKey(typeQName, true, false, false, null);
-                SchemaType schemaType = (SchemaType) schemaTypeKeyToSchemaTypeMap.get(key);
-                if (schemaType == null) {
-                    throw new DeploymentException("Schema type key " + key + " not found in analyzed schema: " + schemaTypeKeyToSchemaTypeMap);
+                
+                SchemaTypeKey key = (SchemaTypeKey) qNameToKey.get(typeQName);
+                if (null == key) {
+                    continue;
+//                    throw new DeploymentException("Type Qname " + typeQName + " defined by operation " + 
+//                            operationDesc + " has not been found in schema: " + schemaTypeKeyToSchemaTypeMap);
                 }
+                SchemaType schemaType = (SchemaType) schemaTypeKeyToSchemaTypeMap.get(key);
                 mappedTypeQNames.add(key.getqName());
 	            
                 Class clazz = parameterDesc.getJavaType();