diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-01-28 14:24:47 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-01-28 14:39:54 -0800 |
| commit | fb018838590321a5e0635e0b499a33b31f71a0da (patch) | |
| tree | 572ca6f66be48bbce78bd0b203b44fe3d5117524 /src/objective-c | |
| parent | 610107cc3dced9fd39b24f9d6185e376b3375150 (diff) | |
| parent | ddd91dbb42f6f52655738c6520548d04ea5f8468 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
Diffstat (limited to 'src/objective-c')
4 files changed, 7 insertions, 7 deletions
diff --git a/src/objective-c/ProtoRPC/ProtoMethod.m b/src/objective-c/ProtoRPC/ProtoMethod.m index 1113b4fbaa..75e5efc23e 100644 --- a/src/objective-c/ProtoRPC/ProtoMethod.m +++ b/src/objective-c/ProtoRPC/ProtoMethod.m @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ } - (NSString *)HTTPPath { - if (_package) { + if (_package && _package.length > 0) { return [NSString stringWithFormat:@"/%@.%@/%@", _package, _service, _method]; } else { return [NSString stringWithFormat:@"/%@/%@", _service, _method]; diff --git a/src/objective-c/examples/Sample/Sample/ViewController.m b/src/objective-c/examples/Sample/Sample/ViewController.m index 3d634a340d..a2bb3ee329 100644 --- a/src/objective-c/examples/Sample/Sample/ViewController.m +++ b/src/objective-c/examples/Sample/Sample/ViewController.m @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - NSString * const kRemoteHost = @"grpc-test.sandbox.google.com"; + NSString * const kRemoteHost = @"grpc-test.sandbox.googleapis.com"; RMTSimpleRequest *request = [[RMTSimpleRequest alloc] init]; request.responseSize = 10; diff --git a/src/objective-c/examples/SwiftSample/ViewController.swift b/src/objective-c/examples/SwiftSample/ViewController.swift index 76dad9e132..a21ce07978 100644 --- a/src/objective-c/examples/SwiftSample/ViewController.swift +++ b/src/objective-c/examples/SwiftSample/ViewController.swift @@ -38,7 +38,7 @@ class ViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - let RemoteHost = "grpc-test.sandbox.google.com" + let RemoteHost = "grpc-test.sandbox.googleapis.com" let request = RMTSimpleRequest() request.responseSize = 10 diff --git a/src/objective-c/tests/InteropTestsRemote.m b/src/objective-c/tests/InteropTestsRemote.m index a67be98431..00eadc25bc 100644 --- a/src/objective-c/tests/InteropTestsRemote.m +++ b/src/objective-c/tests/InteropTestsRemote.m @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ #import "InteropTests.h" -static NSString * const kRemoteSSLHost = @"grpc-test.sandbox.google.com"; +static NSString * const kRemoteSSLHost = @"grpc-test.sandbox.googleapis.com"; /** Tests in InteropTests.m, sending the RPCs to a remote SSL server. */ @interface InteropTestsRemote : InteropTests |