Skip to content

Commit 5ee52e9

Browse files
Merge pull request #1 from cerrywallace/feature/empty-response-management
Feature/empty response management
2 parents 4fa1432 + bfce918 commit 5ee52e9

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

DockerSwift.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'DockerSwift'
11-
s.version = '1.0.0'
11+
s.version = '1.0.1'
1212
s.platform = :ios
1313
s.ios.deployment_target = '9.0'
1414
s.swift_version = '4.2'

DockerSwift/Classes/Service/ServiceManager.swift

+5-7
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,12 @@ open class ServiceManager { // : Singleton, Initializable
155155
let retrievedData = !(data?.isEmpty ?? true) ? data : nil
156156
let responseClass = Resp.self
157157
var responseError: DockerError?
158-
switch (urlResponse, retrievedData, error) {
159-
case let (.some(urlResponse), .some(retrievedData), .none):
160-
response = responseClass.init(statusCode: urlResponse.statusCode, data: retrievedData, request: serviceCall.request, response: urlResponse)
161-
break
162-
case let (.some(urlResponse), .some(retrievedData), .some(error)):
163-
response = responseClass.init(statusCode: urlResponse.statusCode, data: retrievedData, request: serviceCall.request, response: urlResponse)
158+
switch (urlResponse, error) {
159+
case let (.some(urlResponse), .none):
160+
response = responseClass.init(statusCode: urlResponse.statusCode, data: retrievedData ?? Data(), request: serviceCall.request, response: urlResponse)
161+
case let (.some(urlResponse), .some(error)):
162+
response = responseClass.init(statusCode: urlResponse.statusCode, data: retrievedData ?? Data(), request: serviceCall.request, response: urlResponse)
164163
responseError = DockerError.underlying(error, urlResponse, response.httpStatusCode)
165-
break
166164
default:
167165
response = responseClass.init(statusCode: 0, data: data ?? Data(), request: serviceCall.request, response: urlResponse)
168166
var httpErrorCode = NSURLErrorUnknown

0 commit comments

Comments
 (0)