From f82cc6458bbae0e4d0f5feb13f0692e8dcc25876 Mon Sep 17 00:00:00 2001
From: Ramnivas Laddad <rladdad@vmware.com>
Date: Mon, 8 Mar 2010 20:42:22 +0000
Subject: [PATCH] Fixed SPR-6734 by resticting record/replay logic to only
 entity methods that originated in a test method

---
 .../mock/staticmock/AbstractMethodMockingControl.aj             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj b/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
index 30bf1ab8f69..25b8c35b494 100644
--- a/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
+++ b/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
@@ -151,7 +151,7 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
 		expectations.verify();
 	}
 
-	Object around() : methodToMock() {
+	Object around() : methodToMock() && cflowbelow(mockStaticsTestMethod()) {
 		if (recording) {
 			expectations.expectCall(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());
 			// Return value doesn't matter