Update OCMock to 3.1.5

third_party/ocmock/OCMock/OCMIndirectReturnValueProvider.m

Index: third_party/ocmock/OCMock/OCMIndirectReturnValueProvider.m
diff --git a/third_party/ocmock/OCMock/OCMIndirectReturnValueProvider.m b/third_party/ocmock/OCMock/OCMIndirectReturnValueProvider.m
index c8b734d7c980873bf015b653c9ac1eaafb35df7c..1f22d99347c5f1df7d28fcc4506daf297d13bcb3 100644
--- a/third_party/ocmock/OCMock/OCMIndirectReturnValueProvider.m
+++ b/third_party/ocmock/OCMock/OCMIndirectReturnValueProvider.m
@@ -1,19 +1,34 @@
-//---------------------------------------------------------------------------------------
-//  $Id$
-//  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
+/*
+ *  Copyright (c) 2009-2015 Erik Doernenburg and contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use these files except in compliance with the License. You may obtain
+ *  a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ */
 
 #import "NSMethodSignature+OCMAdditions.h"
 #import "OCMIndirectReturnValueProvider.h"
+#import "NSInvocation+OCMAdditions.h"
 
 
 @implementation OCMIndirectReturnValueProvider
 
 - (id)initWithProvider:(id)aProvider andSelector:(SEL)aSelector
 {
-	self = [super init];
-	provider = [aProvider retain];
-	selector = aSelector;
+    if ((self = [super init]))
+    {
+        provider = [aProvider retain];
+        selector = aSelector;
+    }
+	
 	return self;
 }
 
@@ -25,9 +40,15 @@
 
 - (void)handleInvocation:(NSInvocation *)anInvocation
 {
-	[anInvocation setTarget:provider];
+    id originalTarget = [anInvocation target];
+    SEL originalSelector = [anInvocation selector];
+
+    [anInvocation setTarget:provider];
 	[anInvocation setSelector:selector];
 	[anInvocation invoke];
+
+    [anInvocation setTarget:originalTarget];
+    [anInvocation setSelector:originalSelector];
 }
 
 @end