Merge pull request grpc#17751 from muxi/fix-authorizer

muxi · web-flow · commit c4ef85588dd6 · 2019-01-22T11:00:35.000-08:00
Fix authorizer
diff --git a/src/objective-c/GRPCClient/GRPCCall.m b/src/objective-c/GRPCClient/GRPCCall.m
@@ -889,14 +889,18 @@ - (void)startWithWriteable:(id<GRXWriteable>)writeable {
     [tokenProvider getTokenWithHandler:^(NSString *token) {
       __strong typeof(self) strongSelf = weakSelf;
       if (strongSelf) {
+        BOOL startCall = NO;
         @synchronized(strongSelf) {
-          if (strongSelf->_state == GRXWriterStateNotStarted) {
+          if (strongSelf->_state != GRXWriterStateFinished) {
+            startCall = YES;
             if (token) {
               strongSelf->_fetchedOauth2AccessToken = [token copy];
             }
           }
         }
-        [strongSelf startCallWithWriteable:writeable];
+        if (startCall) {
+          [strongSelf startCallWithWriteable:writeable];
+        }
       }
     }];
   } else {

Original file line number	Diff line number	Diff line change
`@@ -889,14 +889,18 @@ - (void)startWithWriteable:(id<GRXWriteable>)writeable {`
`889`	`889`	`[tokenProvider getTokenWithHandler:^(NSString *token) {`
`890`	`890`	`__strong typeof(self) strongSelf = weakSelf;`
`891`	`891`	`if (strongSelf) {`
	`892`	`+ BOOL startCall = NO;`
`892`	`893`	`@synchronized(strongSelf) {`
`893`		`- if (strongSelf->_state == GRXWriterStateNotStarted) {`
	`894`	`+ if (strongSelf->_state != GRXWriterStateFinished) {`
	`895`	`+ startCall = YES;`
`894`	`896`	`if (token) {`
`895`	`897`	`strongSelf->_fetchedOauth2AccessToken = [token copy];`
`896`	`898`	`}`
`897`	`899`	`}`
`898`	`900`	`}`
`899`		`- [strongSelf startCallWithWriteable:writeable];`
	`901`	`+ if (startCall) {`
	`902`	`+ [strongSelf startCallWithWriteable:writeable];`
	`903`	`+ }`
`900`	`904`	`}`
`901`	`905`	`}];`
`902`	`906`	`} else {`