TouchInstinct
/
RxSwift
311
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #536 from zhigang1992/PR-Remove-NSData 

remove ?? NSData()
This commit is contained in:
Krunoslav Zaher 2016-03-08 22:52:58 +01:00
parent e5735611c9 b4d129974f
commit 1fa8cc431a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RxCocoa/Common/Observables/NSURLSession+Rx.swift
View File

@ -180,7 +180,7 @@ extension NSURLSession {
public func rx_data(request: NSURLRequest) -> Observable<NSData> {
return rx_response(request).map { (data, response) -> NSData in
if 200 ..< 300 ~= response.statusCode {
return data ?? NSData()
return data
}
else {
throw RxCocoaURLError.HTTPRequestFailed(response: response, data: data)
@ -209,7 +209,7 @@ extension NSURLSession {
public func rx_JSON(request: NSURLRequest) -> Observable<AnyObject> {
return rx_data(request).map { (data) -> AnyObject in
do {
return try NSJSONSerialization.JSONObjectWithData(data ?? NSData(), options: [])
return try NSJSONSerialization.JSONObjectWithData(data, options: [])
} catch let error {
throw RxCocoaURLError.DeserializationError(error: error)
}