svn commit: r633060 - /webservices/axis2/trunk/c/util/src/uri.c

[senaka]

Author: senaka
Date: Mon Mar  3 04:17:57 2008
New Revision: 633060

URL: http://svn.apache.org/viewvc?rev=633060&view=rev
Log:
Fixing JIRA Issue AXIS2C-1022

Modified:
    webservices/axis2/trunk/c/util/src/uri.c

Modified: webservices/axis2/trunk/c/util/src/uri.c
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/uri.c?rev=633060&r1=633059&r2=633060&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/uri.c (original)
+++ webservices/axis2/trunk/c/util/src/uri.c Mon Mar  3 04:17:57 2008
@@ -741,6 +741,7 @@
     unsigned flags)
 {
     axis2_char_t *ret = "";
+    axis2_char_t *temp = NULL;
     AXIS2_ENV_CHECK(env, NULL);
 
     /* If suppressing the site part, omit both user name & scheme://hostname */
@@ -768,6 +769,7 @@
                                                                    && !(flags &
                                                                         
AXIS2_URI_UNP_OMITPASSWORD)))
                               ? "@" : "", NULL);
+            temp = ret;
         }
 
         /* Construct scheme://site string */
@@ -794,6 +796,11 @@
                                   uri->hostname, rbrk,
                                   is_default_port ? "" : ":",
                                   is_default_port ? "" : uri->port_str, NULL);
+                if (temp)
+                {
+                    AXIS2_FREE(env->allocator, temp);
+                    temp = ret;
+                }
             }
             else
             {
@@ -806,6 +813,11 @@
                     axutil_strcat(env, "//", ret, lbrk, uri->hostname, rbrk,
                                   is_default_port ? "" : ":",
                                   is_default_port ? "" : uri->port_str, NULL);
+                if (temp)
+                {
+                    AXIS2_FREE(env->allocator, temp);
+                    temp = ret;
+                }
             }
         }
     }
@@ -825,6 +837,10 @@
                           : NULL, (uri->fragment &&
                                    !(flags & AXIS2_URI_UNP_OMITQUERY)) ? uri->
                           fragment : NULL, NULL);
+        if (temp)
+        {
+            AXIS2_FREE(env->allocator, temp);
+        }
     }
     return ret;
 }



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