Skip to content

Fix duplicate EDO classes issue in EDOIsRemoteObject. #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix duplicate EDO classes issue in EDOIsRemoteObject. #303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions Service/Sources/EDOClientService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#import "Service/Sources/EDOClientService.h"

#include <objc/runtime.h>
#import <stddef.h>

#import "Channel/Sources/EDOChannel.h"
#import "Channel/Sources/EDOChannelPool.h"
Expand Down Expand Up @@ -248,7 +249,7 @@ + (EDOServiceResponse *)sendSynchronousRequest:(EDOServiceRequest *)request
+ (EDOServiceResponse *)sendSynchronousRequest:(EDOServiceRequest *)request
onPort:(EDOHostPort *)port
withExecutor:(EDOExecutor *)executor {
return [self sendSynchronousRequest:request onPort:port withExecutor:executor error:NULL];
return [self sendSynchronousRequest:request onPort:port withExecutor:executor error:nullptr];
}

+ (EDOServiceResponse *)sendSynchronousRequest:(EDOServiceRequest *)request
Expand Down Expand Up @@ -462,15 +463,10 @@ + (id)responseObjectWithRequest:(EDOServiceRequest *)request onPort:(EDOHostPort
* classes to optimize the check.
*/
BOOL EDOIsRemoteObject(id object) {
static Class remoteObjectClass;
static Class remoteBlockClass;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
remoteObjectClass = [EDOObject class];
remoteBlockClass = [EDOBlockObject class];
});
Class objectClass = [object class];
return objectClass == remoteObjectClass || objectClass == remoteBlockClass;
const char *className = objectClass ? class_getName(objectClass) : nullptr;
return className &&
(strcmp(className, "EDOObject") == 0 || strcmp(className, "EDOBlockObject") == 0);
}

void EDOExportEDOClientError(NSError *error) { gEDOClientErrorHandler(error); }