[jboss-cvs] JBossAS SVN: r70852 - projects/aop/trunk/aop/src/main/org/jboss/aop.

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

Author: kabir.khan at jboss.com
Date: 2008-03-13 19:48:36 -0400 (Thu, 13 Mar 2008)
New Revision: 70852

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
Log:
Don't override the maintainAdvisorMethodInterceptors field if no property was set

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java	2008-03-13 23:30:06 UTC (rev 70851)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java	2008-03-13 23:48:36 UTC (rev 70852)
@@ -336,7 +336,11 @@
                   classicOrder = (new Boolean(classic)).booleanValue();
                }
 
-               maintainAdvisorMethodInterceptors = (new Boolean(System.getProperty("jboss.aop.advisor.methodInterceptors", "false"))).booleanValue();
+               String methodInterceptors = System.getProperty("jboss.aop.advisor.methodInterceptors", null);
+               if (methodInterceptors != null)
+               {
+                  maintainAdvisorMethodInterceptors = (new Boolean(methodInterceptors)).booleanValue();
+               }
 
 
                Deployment.deploy();