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

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

Author: kabir.khan at jboss.com
Date: 2008-08-20 10:37:58 -0400 (Wed, 20 Aug 2008)
New Revision: 77246

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/MarshalledInterfaceProxy.java
Log:
[JBAOP-625] No way to determine classloader properly here

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/MarshalledInterfaceProxy.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/MarshalledInterfaceProxy.java	2008-08-20 14:24:02 UTC (rev 77245)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/MarshalledInterfaceProxy.java	2008-08-20 14:37:58 UTC (rev 77246)
@@ -58,7 +58,12 @@
    {
       try
       {
-         ClassLoader cl = SecurityActions.getClassLoader(advisor.getInstance().getClass());
+         ClassLoader cl = null;
+         if (advisor.getInstance() != null)
+         {
+            cl = SecurityActions.getClassLoader(advisor.getInstance().getClass());
+         }
+         //FIXME: When will instance not be null?
          if (cl == null)
          {
             //Fall back to the context classloader