From 51e0e3f45ebc822d0706305379dbfa0676fe4db8 Mon Sep 17 00:00:00 2001
From: Gregory John Casamento <greg.casamento@gmail.com>
Date: Wed, 10 Apr 2019 05:43:25 -0400
Subject: [PATCH] Some additional changes to the test

---
 Headers/Foundation/NSString.h |  5 ++++-
 Source/NSString.m             | 10 +++++-----
 Tests/base/NSString/test09.m  |  2 ++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Headers/Foundation/NSString.h b/Headers/Foundation/NSString.h
index b9c8ea67e..90f195da5 100644
--- a/Headers/Foundation/NSString.h
+++ b/Headers/Foundation/NSString.h
@@ -800,9 +800,12 @@ typedef NSUInteger NSStringEncodingConversionOptions;
 - (NSString*) stringByReplacingPercentEscapesUsingEncoding: (NSStringEncoding)e;
 - (NSString*) stringByTrimmingCharactersInSet: (NSCharacterSet*)aSet;
 - (const char *)UTF8String;
+#endif
+
+  // #if OS_API_VERSION(MAC_OS_X_VERSION_10_9,GS_API_LATEST)
 - (NSString *) stringByAddingPercentEncodingWithAllowedCharacters: (NSCharacterSet *)aSet;
 - (NSString *) stringByRemovingPercentEncoding;
-#endif
+  //#endif
 
 #if OS_API_VERSION(MAC_OS_X_VERSION_10_3,GS_API_LATEST) 
 /** Not implemented */
diff --git a/Source/NSString.m b/Source/NSString.m
index 1cd97fdad..1e9f886ef 100644
--- a/Source/NSString.m
+++ b/Source/NSString.m
@@ -1926,12 +1926,12 @@ GSICUCollatorOpen(NSStringCompareOptions mask, NSLocale *locale)
 	      lo = (c & 0x0f);
 	      dst[dpos++] = (lo > 9) ? 'A' + lo - 10 : '0' + lo;
 	    }
-	  s = [[NSString alloc] initWithBytes: dst
-				       length: dpos
-				     encoding: NSUTF8StringEncoding];
-	  NSZoneFree(NSDefaultMallocZone(), dst);
-	  IF_NO_GC([s autorelease];)
 	}
+      s = [[NSString alloc] initWithBytes: dst
+				   length: dpos
+				 encoding: NSUTF8StringEncoding];
+      NSZoneFree(NSDefaultMallocZone(), dst);
+      IF_NO_GC([s autorelease];)
     }
   return s;
 }
diff --git a/Tests/base/NSString/test09.m b/Tests/base/NSString/test09.m
index f733c2ef2..34cf2834b 100644
--- a/Tests/base/NSString/test09.m
+++ b/Tests/base/NSString/test09.m
@@ -5,7 +5,9 @@
 
 BOOL testUrlCharacterSetEncoding(NSString* decodedString, NSString* encodedString, NSCharacterSet* allowedCharacterSet)
 {
+  NSLog(@"String by adding percent");
   NSString* testString = [decodedString stringByAddingPercentEncodingWithAllowedCharacters:allowedCharacterSet];
+  NSLog(@"String by adding percent, done. test=%@ decoded=%@", testString, decodedString);
   return [encodedString isEqualToString: testString];
 }