[jboss-cvs] JBossAS SVN: r59378 - projects/aop/trunk/aop/src/main/org/jboss/aop/instrument

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2007-01-05 13:24:04 -0500 (Fri, 05 Jan 2007)
New Revision: 59378

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
Log:
Fix NPE when running in JBoss

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java	2007-01-05 18:23:16 UTC (rev 59377)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java	2007-01-05 18:24:04 UTC (rev 59378)
@@ -1737,7 +1737,13 @@
       
       public static final AroundAdviceCallStrategy getInstance()
       {
-         return INSTANCE.get();
+         AroundAdviceCallStrategy strategy = INSTANCE.get();
+         if (strategy == null)
+         {
+            strategy = new AroundAdviceCallStrategy();
+            INSTANCE.set(strategy);
+         }
+         return strategy;
       }
       
       private AroundAdviceCallStrategy() {}