260384: NumberFormatException

3 files changed, 62 insertions, 3 deletions

diff --git a/tests/bugs164/pr260384/C.java b/tests/bugs164/pr260384/C.java
new file mode 100644
index 000000000..64a6c8aa1
--- /dev/null
+++ b/tests/bugs164/pr260384/C.java
@@ -0,0 +1,50 @@
+public class C {
+	SessionFactory sf;
+	HT ht;
+	
+          public void m() {
+        	  LocalSessionFactoryBean lsfb = new LocalSessionFactoryBean() {
+        		  protected SessionFactory newSessionFactory(Configuration config) throws Exception {
+        			  return sf;
+        		  }
+        	  };
+              final TT tt = new TT();
+              tt.execute(new TransactionCallback() {
+            	   public Object doInTransaction(TransactionStatus status) {
+            		   System.out.println("X");
+            		   ht.execute(new HibernateCallback() {
+            			   public Object doInHibernate(Session session) {
+            				   return null;
+            			   }
+            		   });
+            		   tt.execute(new TransactionCallback() {
+                    	   public Object doInTransaction(TransactionStatus status) {
+                    		   System.out.println("X");
+                    		   ht.execute(new HibernateCallback() {
+                    			   public Object doInHibernate(Session session) {
+                    				   return null;
+                    			   }
+                    		   });
+                    		   return null;
+                    	   }
+            		   });
+            		   return null;
+            	   }
+              });
+          }
+}
+
+class TT { public void execute(Object o) {}}
+class LocalSessionFactoryBean {}
+class HT  { public void execute(Object o) {}}
+class Session {}
+class TransactionStatus {}
+class SessionFactory {}
+class Configuration {}
+class TransactionCallback {}
+class HibernateCallback {}
+
+
+aspect X {
+	before(): within(*) {}
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
index 326c2ce97..7e2286fa1 100644
--- a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
@@ -26,6 +26,10 @@ public class Ajc164Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 		runTest("compiling spring - 2");
 	}
 	
+	public void testCompilingSpring_pr260384_3() {
+		runTest("compiling spring - 3");
+	}
+	
 	public void testAtAspectJDecp_pr164016() {
 		runTest("ataspectj decp 164016");
 	}
diff --git a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
index 1d036168a..6b44c4ce6 100644
--- a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
+++ b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
@@ -2,9 +2,8 @@
 
 <suite>
     
-    <ajc-test dir="bugs164/pr164016" title="ataspectj decp 164016">
-      <compile files="Code.aj" options="-1.5"/>
-      <run class="test.Code"/>
+    <ajc-test dir="bugs164/pr260384" title="compiling spring - 3">
+      <compile files="C.java" options="-1.5 -emacssym"/>
     </ajc-test>    
     
     <ajc-test dir="bugs164/pr260384" title="compiling spring">
@@ -17,6 +16,12 @@
       </compile>
     </ajc-test>    
     
+    <ajc-test dir="bugs164/pr164016" title="ataspectj decp 164016">
+      <compile files="Code.aj" options="-1.5"/>
+      <run class="test.Code"/>
+    </ajc-test>    
+    
+    
     <ajc-test dir="bugs164/pr164016" title="ataspectj decp 164016 - 2">
       <compile files="Code.java TargetBad.java TargetGood.java" aspectpath="code.jar" options="-1.5"/>
       <run class="test.Code"/>