Fixed SPR-6734 by resticting record/replay logic to only entity methods that originated in a test method

2010-03-08 20:42:22 +00:00 · 2010-03-08 20:42:22 +00:00 · f82cc6458b
parent 8d7df01d73
commit f82cc6458b
1 changed files with 1 additions and 1 deletions
--- 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