[Opalvoip-svn] SF.net SVN: opalvoip:[29847] ptlib/trunk

[<rjo...@us...>]

Revision: 29847
          http://sourceforge.net/p/opalvoip/code/29847
Author:   rjongbloed
Date:     2013-05-31 03:24:48 +0000 (Fri, 31 May 2013)
Log Message:
-----------
Merged revision(s) 29837-29846 from ptlib/branches/v2_12:
Don't assert if PURL default scheme is empty string, treat like NULL, that is, no default scheme.

Modified Paths:
--------------
    ptlib/trunk/src/ptclib/url.cxx

Property Changed:
----------------
    ptlib/trunk/

Index: ptlib/trunk
===================================================================
--- ptlib/trunk	2013-05-31 03:18:06 UTC (rev 29846)
+++ ptlib/trunk	2013-05-31 03:24:48 UTC (rev 29847)

Property changes on: ptlib/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -4,7 +4,7 ##
 /ptlib/branches/Sirius_B:24839,24844,24968,24982
 /ptlib/branches/csoutheren/LalandeBranch1:23331-23333,23723
 /ptlib/branches/v2_10:25177-29189
-/ptlib/branches/v2_12:28485-29836
+/ptlib/branches/v2_12:28485-29846
 /ptlib/branches/v2_2:20746,20791,20827,22014,22942
 /ptlib/branches/v2_4:21086,21094,21147,21160,21185,21281,21296,21305,21322,21337,21363,21467,21471-21472,21506,21508,21623,21695,21744,21746,21763,22241,22958,23045-23046,23061,23066,23712
 /ptlib/branches/v2_6:22195,22243,22295,22304,22311,22317,22320,22356,22458,22509,22587,22601-22602,22611,22629,22633,22673,22681,22729,22731-22732,22736,22742,22848,22960,22992,23161,23163,23167,23169,23177,23239,23291,23298,23336,23429,23595,23823,23827,23873,24816
\ No newline at end of property
Modified: ptlib/trunk/src/ptclib/url.cxx
===================================================================
--- ptlib/trunk/src/ptclib/url.cxx	2013-05-31 03:18:06 UTC (rev 29846)
+++ ptlib/trunk/src/ptclib/url.cxx	2013-05-31 03:24:48 UTC (rev 29847)
@@ -430,7 +430,7 @@
   }
 
   // if we could not match a scheme, then use the specified default scheme
-  if (schemeInfo == NULL && defaultScheme != NULL) {
+  if (schemeInfo == NULL && defaultScheme != NULL && *defaultScheme != '\0') {
     scheme = defaultScheme;
     schemeInfo = PURLSchemeFactory::CreateInstance(defaultScheme);
     PAssert(schemeInfo != NULL, "Default scheme " + scheme + " not available");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.