Author: jkaputin
Date: Wed Nov  9 06:52:47 2005
New Revision: 332055

URL: http://svn.apache.org/viewcvs?rev=332055&view=rev
Log:
check for null qname arg in the getElementDeclaration 

and getTypeDefinition methods.

Modified:
    
incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java

Modified: 
incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java
URL: 
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java?rev=332055&r1=332054&r2=332055&view=diff
==============================================================================
--- 
incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java 
(original)
+++ 
incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java 
Wed Nov  9 06:52:47 2005
@@ -150,13 +150,17 @@
     public ElementDeclaration getElementDeclaration(QName qname)

     {

         ElementDeclaration elDec = null;

-        Iterator i = fElementDeclarations.iterator();

-        while(i.hasNext())

+        if(qname != null)

         {

-            ElementDeclaration ed = (ElementDeclaration)i.next();

-            if(qname.equals(ed.getName())) 

+            Iterator i = fElementDeclarations.iterator();

+            while(i.hasNext())

             {

-                elDec = ed;

+                ElementDeclaration ed = (ElementDeclaration)i.next();

+                if(qname.equals(ed.getName())) 

+                {

+                    elDec = ed;

+                    break;

+                }

             }

         }

         return elDec;

@@ -180,13 +184,17 @@
     public TypeDefinition getTypeDefinition(QName qname)

     {

         TypeDefinition typeDef = null;

-        Iterator i = fTypeDefinitions.iterator();

-        while(i.hasNext())

+        if(qname != null)

         {

-            TypeDefinition td = (TypeDefinition)i.next();

-            if(qname.equals(td.getName())) 

+            Iterator i = fTypeDefinitions.iterator();

+            while(i.hasNext())

             {

-                typeDef = td;

+                TypeDefinition td = (TypeDefinition)i.next();

+                if(qname.equals(td.getName())) 

+                {

+                    typeDef = td;

+                    break;

+                }

             }

         }

         return typeDef;




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to