From b4d129974f31f20e592c19b0e3c958f58808d684 Mon Sep 17 00:00:00 2001 From: Zhigang Fang Date: Tue, 8 Mar 2016 09:08:08 +0800 Subject: [PATCH] Remove unneed ?? NSData() --- RxCocoa/Common/Observables/NSURLSession+Rx.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RxCocoa/Common/Observables/NSURLSession+Rx.swift b/RxCocoa/Common/Observables/NSURLSession+Rx.swift index 5fef6e6d..99bceaa3 100644 --- a/RxCocoa/Common/Observables/NSURLSession+Rx.swift +++ b/RxCocoa/Common/Observables/NSURLSession+Rx.swift @@ -180,7 +180,7 @@ extension NSURLSession { public func rx_data(request: NSURLRequest) -> Observable { 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 { 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) }