axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r380068 - in /webservices/axis2/trunk/c/modules/xml/om: om_element.c om_stax_builder.c
Date Thu, 23 Feb 2006 08:30:01 GMT
Author: nandika
Date: Thu Feb 23 00:29:57 2006
New Revision: 380068

URL: http://svn.apache.org/viewcvs?rev=380068&view=rev
Log:
an error in attribute processing corrected

Modified:
    webservices/axis2/trunk/c/modules/xml/om/om_element.c
    webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c

Modified: webservices/axis2/trunk/c/modules/xml/om/om_element.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_element.c?rev=380068&r1=380067&r2=380068&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_element.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_element.c Thu Feb 23 00:29:57 2006
@@ -683,7 +683,6 @@
                    
         }
         axis2_hash_free (AXIS2_INTF_TO_IMPL(om_element)->attributes, env);
-        AXIS2_FREE((*env)->allocator, hi);
     }
         
         if (element_impl->namespaces)
@@ -701,7 +700,6 @@
                 val = NULL;
                    
             }
-            AXIS2_FREE((*env)->allocator, hi);
             axis2_hash_free (element_impl->namespaces, env);
             /*TODO: free namespaces */
            /* need to iterate and free individual namespaces */

Modified: webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c?rev=380068&r1=380067&r2=380068&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c Thu Feb 23 00:29:57 2006
@@ -213,15 +213,27 @@
               
         prefix = AXIS2_XML_READER_GET_ATTRIBUTE_PREFIX_BY_NUMBER(
                         builder_impl->parser, env, i);
-
         if (uri)
         {
-            if (axis2_strcmp (uri, "") != 0);
+            if (axis2_strcmp (uri, "") != 0)
             {
-                ns = AXIS2_OM_ELEMENT_FIND_NAMESPACE (
-                        (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(element_node,env),
+                axis2_om_element_t *om_ele = NULL;
+                om_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(element_node,env);
+                if(om_ele)
+                {
+                    ns = AXIS2_OM_ELEMENT_FIND_NAMESPACE ( om_ele ,
                         env , element_node, uri, prefix);
+        
+        /* newly added to handle "xml:*" attributes" (AXIS2_STRCMP(prefix, "xml") == 0) &&
*/
+                    if(!ns)
+                    {
+                        ns = axis2_om_namespace_create(env, uri, prefix);
+                    }
+        /*                                          */                                
+                }                        
             }
+           
+            
         }
         attr_name = AXIS2_XML_READER_GET_ATTRIBUTE_NAME_BY_NUMBER(
                                  builder_impl->parser, env, i);



Mime
View raw message