From 093c6cdca3cbd0808cb3847d1bef2cb0bf0e16c6 Mon Sep 17 00:00:00 2001
From: Tom Robinson <tom@280north.com>
Date: Wed, 13 Jan 2010 01:57:04 -0800
Subject: [PATCH] More robust handing of string passed to CPURLRequest instead
 of CPURLs.

---
 Foundation/CPBundle.j     |  2 +-
 Foundation/CPURLRequest.j | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Foundation/CPBundle.j b/Foundation/CPBundle.j
index 7943c580e..090c293d2 100644
--- a/Foundation/CPBundle.j
+++ b/Foundation/CPBundle.j
@@ -133,7 +133,7 @@
 - (void)loadWithDelegate:(id)aDelegate
 {
     self._delegate = aDelegate;
-    self._infoConnection = [CPURLConnection connectionWithRequest:[CPURLRequest requestWithURL:[self bundlePath] + "/Info.plist"] delegate:self];
+    self._infoConnection = [CPURLConnection connectionWithRequest:[CPURLRequest requestWithURL:[CPURL URLWithString:[self bundlePath] + "/Info.plist"]] delegate:self];
 }
 
 - (CPArray)supportedEnvironments
diff --git a/Foundation/CPURLRequest.j b/Foundation/CPURLRequest.j
index a4d7eb136..44cffe50b 100644
--- a/Foundation/CPURLRequest.j
+++ b/Foundation/CPURLRequest.j
@@ -62,10 +62,7 @@
     
     if (self)
     {
-        if ([aURL isKindOfClass:[CPString class]])
-            _URL = [CPURL URLWithString:aURL];
-        else
-            _URL = aURL;
+        [self setURL:aURL];
 
         _HTTPBody = @"";
         _HTTPMethod = @"GET";
@@ -93,7 +90,10 @@
 */
 - (void)setURL:(CPURL)aURL
 {
-    _URL = aURL;
+    if ([aURL isKindOfClass:[CPURL class]])
+        _URL = aURL;
+    else
+        _URL = [CPURL URLWithString:String(aURL)];
 }
 
 /*!