geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r541036 - /geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java
Date Wed, 23 May 2007 19:13:24 GMT
Author: gawor
Date: Wed May 23 12:13:23 2007
New Revision: 541036

URL: http://svn.apache.org/viewvc?view=rev&rev=541036
Log:
handle multiple imports of the same wsdl/xsd

Modified:
    geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java?view=diff&rev=541036&r1=541035&r2=541036
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java
(original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java
Wed May 23 12:13:23 2007
@@ -191,8 +191,10 @@
                         //check to see if it's aleady in a URL format.  If so, leave it.
                         new URL(start);
                     } catch (MalformedURLException e) {
-                        doneSchemas.put(start, imp);
-                        updateSchemaImports(imp.getReferencedSchema(), doneSchemas, base);
+                        if (!doneSchemas.containsKey(start)) {
+                            doneSchemas.put(start, imp);
+                            updateSchemaImports(imp.getReferencedSchema(), doneSchemas, base);
+                        }
                     }
                 }
             }
@@ -205,8 +207,10 @@
                     //check to see if it's aleady in a URL format.  If so, leave it.
                     new URL(start);
                 } catch (MalformedURLException e) {
-                    doneSchemas.put(start, included);
-                    updateSchemaImports(included.getReferencedSchema(), doneSchemas, base);
+                    if (!doneSchemas.containsKey(start)) {
+                        doneSchemas.put(start, included);
+                        updateSchemaImports(included.getReferencedSchema(), doneSchemas,
base);
+                    }
                 }
             }
         }



Mime
View raw message