From 0fb5f693794e571ab693813cbc80578b2bc7b470 Mon Sep 17 00:00:00 2001
From: jhugunin <jhugunin>
Date: Wed, 12 Mar 2003 00:48:57 +0000
Subject: [PATCH] fixed Bug 29934    runtime NullPointerException when applying
 around advice to other around advice

---
 tests/ajcTests.xml                                 | 7 +++++++
 tests/ajcTestsFailing.xml                          | 7 -------
 tests/jimTests.xml                                 | 7 ++++++-
 weaver/src/org/aspectj/weaver/bcel/BcelShadow.java | 4 ++++
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index a2e0b3c6e..ba710c8b9 100644
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -5659,4 +5659,11 @@
             <message kind="warning" line="74"/>
         </compile>
     </ajc-test>
+    
+    <ajc-test dir="new" pr="29934"
+      title="can't apply around advice to the execution of around advice"
+      keywords="from-resolved_10x">
+        <compile files="CflowCycles.java"/>
+        <run class="CflowCycles"/>
+    </ajc-test>
 </suite>
diff --git a/tests/ajcTestsFailing.xml b/tests/ajcTestsFailing.xml
index b7fadc146..5964c4aee 100644
--- a/tests/ajcTestsFailing.xml
+++ b/tests/ajcTestsFailing.xml
@@ -13,13 +13,6 @@
             <message kind="error" line="78"/>
         </compile>
     </ajc-test>
-    
-    <ajc-test dir="new" pr="29934"
-      title="can't apply around advice to the execution of around advice"
-      keywords="from-resolved_10x">
-        <compile files="CflowCycles.java"/>
-        <run class="CflowCycles"/>
-    </ajc-test>
 
     <ajc-test dir="new" pr="660" title="illegal name binding in around cflow"
       keywords="from-resolved_104">
diff --git a/tests/jimTests.xml b/tests/jimTests.xml
index 53a3a9ef1..e55e54ff7 100644
--- a/tests/jimTests.xml
+++ b/tests/jimTests.xml
@@ -1,6 +1,11 @@
 <!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd">
 <suite>
-
+    <ajc-test dir="new" pr="29934"
+      title="can't apply around advice to the execution of around advice"
+      keywords="from-resolved_10x">
+        <compile files="CflowCycles.java"/>
+        <run class="CflowCycles"/>
+    </ajc-test>
 
     <!--
     
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
index f0b0742d8..6059e7d9f 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
@@ -1206,6 +1206,10 @@ public class BcelShadow extends Shadow {
 			return;
 		}
 		
+		// We can't inline around methods if they have around advice on them, this
+		// is because the weaving will extract the body and hence the proceed call.
+		//??? should consider optimizations to recognize simple cases that don't require body extraction
+		enclosingMethod.setCanInline(false);
 		
 		
 		// start by exposing various useful things into the frame
-- 
2.39.5