Merge pull request #3958 from vishalduggal/timob-13011-hotfix

[TIMOB-13011] Ensure we update methodsignature
tidev · Mar 12, 2013 · 899f43b · 899f43b
2 parents 5d88c05 + 4b646d4
commit 899f43b
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/iphone/Classes/KrollMethod.m b/iphone/Classes/KrollMethod.m
@@ -203,6 +203,12 @@ -(void)dealloc
 	[super dealloc];
 }
 
+-(void)setSelector:(SEL)selector_
+{
+    selector = selector_;
+    _methodSignature = [target methodSignatureForSelector:selector];
+}
+
 -(void)updateJSObjectWithValue:(id)value forKey:(NSString *)key
 {
 	if (!updatesProperty)
@@ -251,7 +257,7 @@ -(id)call:(NSArray*)args
 	{
 		//TODO: This likely could be further optimized later
 		//
-		bool useResult = [self.methodSignature methodReturnLength] == sizeof(id);
+		bool useResult = [_methodSignature methodReturnLength] == sizeof(id);
 		id result = nil;
 		id delegate = context.delegate;
 		IMP methodFunction = [target methodForSelector:selector];
@@ -267,7 +273,7 @@ -(id)call:(NSArray*)args
 
 
 	// create proxy method invocation
-	if (self.methodSignature==nil)
+	if (_methodSignature==nil)
 	{
 		@throw [NSException exceptionWithName:@"org.appcelerator.kroll" reason:[NSString stringWithFormat:@"invalid method '%@'",NSStringFromSelector(selector)] userInfo:nil];
 	}
@@ -280,7 +286,7 @@ -(id)call:(NSArray*)args
 		[target setExecutionContext:context.delegate];
 	}
 
-	int methodArgCount = [self.methodSignature numberOfArguments];
+	int methodArgCount = [_methodSignature numberOfArguments];
 
 	if (methodArgCount > 0 && argcount > 0)
 	{
@@ -312,14 +318,14 @@ -(id)call:(NSArray*)args
 		}
 	}
 
-	if ([self.methodSignature methodReturnLength] == sizeof(id)) 
+	if ([_methodSignature methodReturnLength] == sizeof(id))
 	{
 		id result;
 		result = methodFunction(target,selector,arg1,arg2);
 		return result;
 	}
 
-	const char * retType = [self.methodSignature methodReturnType];
+	const char * retType = [_methodSignature methodReturnType];
 	char t = retType[0];
 	switch(t)
 	{