svn commit: r573135 - /webservices/rampart/trunk/c/src/omxmlsec/axiom.c

[manjula]

Author: manjula
Date: Wed Sep  5 19:54:56 2007
New Revision: 573135

URL: http://svn.apache.org/viewvc?rev=573135&view=rev
Log:
Freeing the returned attribute hash seperately after calling 
axiom_element_get_attributes method.

Modified:
    webservices/rampart/trunk/c/src/omxmlsec/axiom.c

Modified: webservices/rampart/trunk/c/src/omxmlsec/axiom.c
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/axiom.c?rev=573135&r1=573134&r2=573135&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/axiom.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/axiom.c Wed Sep  5 19:54:56 2007
@@ -199,8 +199,10 @@
     axutil_hash_index_t *hi = NULL;
     axis2_char_t *local_name = NULL;
     axis2_char_t *ns_uri = NULL;
+    axis2_char_t *found_val = NULL;
 
     ele = axiom_node_get_data_element(node, env);
+
     /*Get attribute list of the element*/
     attr_list = axiom_element_extract_attributes(ele, env, node);
     if(!attr_list){
@@ -233,26 +235,29 @@
             }else{
                 this_attr_ns_uri = "";
             }
-            if(0 == axutil_strcmp(local_name, this_attr_name) && 0 == 
axutil_strcmp(ns_uri, this_attr_ns_uri)){
-                axis2_char_t *found_val = NULL;
+            if(0 == axutil_strcmp(local_name, this_attr_name) && 0 == 
axutil_strcmp(ns_uri, this_attr_ns_uri))
+            {
                 /*Got it !!!*/
                 found_val = axiom_attribute_get_value(om_attr, env);
-                axutil_hash_free(attr_list, env);
-                attr_list = NULL;
-                axiom_attribute_free(om_attr, env);
-                om_attr = NULL;
-
-                return found_val;
+                break;
             }
-            axiom_attribute_free(om_attr, env);
-            om_attr = NULL;
         }
     }
+
+    for(hi = axutil_hash_first(attr_list, env); hi; hi = axutil_hash_next(env, 
hi))
+    {
+        void *val = NULL;
+        axutil_hash_this(hi, NULL, NULL, &val);
+        if (val)
+        {
+            axiom_attribute_free((axiom_attribute_t *)val, env);  
+            val = NULL;  
+        }
+    }    
     axutil_hash_free(attr_list, env);
     attr_list = NULL;
   
-    /*Not found! return NULL*/
-   return NULL;
+    return found_val;
 }