Merge pull request #27 from longbai/fixed_error_non_utf8

longbai · longbai · commit dfa371b0c8a5 · 2015-03-09T11:12:28.000+08:00
fixed non utf8 body
diff --git a/QiniuSDK/Common/QNConfig.m b/QiniuSDK/Common/QNConfig.m
@@ -25,4 +25,4 @@
 
 const UInt32 kQNRetryMax = 3;
 
-const float kQNTimeoutInterval = 30.0;
+const float kQNTimeoutInterval = 60.0;
diff --git a/QiniuSDK/Http/QNResponseInfo.m b/QiniuSDK/Http/QNResponseInfo.m
@@ -93,7 +93,12 @@ - (instancetype)init:(int)status
 				NSError *tmp;
 				NSDictionary *uInfo = [NSJSONSerialization JSONObjectWithData:body options:NSJSONReadingMutableLeaves error:&tmp];
 				if (tmp != nil) {
-					uInfo = @{ @"error":[[NSString alloc] initWithData:body encoding:NSUTF8StringEncoding] };
+					// 出现错误时，如果信息是非UTF8编码会失败，返回nil
+					NSString *str = [[NSString alloc] initWithData:body encoding:NSUTF8StringEncoding];
+					if (str == nil) {
+						str = @"";
+					}
+					uInfo = @{ @"error": str };
 				}
 				_error = [[NSError alloc] initWithDomain:domain code:_statusCode userInfo:uInfo];
 			}

Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,4 @@`
`25`	`25`
`26`	`26`	`const UInt32 kQNRetryMax = 3;`
`27`	`27`
`28`		`-const float kQNTimeoutInterval = 30.0;`
	`28`	`+const float kQNTimeoutInterval = 60.0;`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,12 @@ - (instancetype)init:(int)status`
`93`	`93`	`NSError *tmp;`
`94`	`94`	`NSDictionary *uInfo = [NSJSONSerialization JSONObjectWithData:body options:NSJSONReadingMutableLeaves error:&tmp];`
`95`	`95`	`if (tmp != nil) {`
`96`		`- uInfo = @{ @"error":[[NSString alloc] initWithData:body encoding:NSUTF8StringEncoding] };`
	`96`	`+ // 出现错误时，如果信息是非UTF8编码会失败，返回nil`
	`97`	`+ NSString *str = [[NSString alloc] initWithData:body encoding:NSUTF8StringEncoding];`
	`98`	`+ if (str == nil) {`
	`99`	`+ str = @"";`
	`100`	`+ }`
	`101`	`+ uInfo = @{ @"error": str };`
`97`	`102`	`}`
`98`	`103`	`_error = [[NSError alloc] initWithDomain:domain code:_statusCode userInfo:uInfo];`
`99`	`104`	`}`