[jboss-cvs] JBossAS SVN: r98002 - projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool.

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

Author: flavia.rainone at jboss.com
Date: 2009-12-18 20:15:52 -0500 (Fri, 18 Dec 2009)
New Revision: 98002

Modified:
   projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPoolFactory.java
Log:
[JBAOP-742] AOPClassPoolFactory must check for null ClassPools before creating an AOPClassPool

Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPoolFactory.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPoolFactory.java	2009-12-19 00:36:03 UTC (rev 98001)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPoolFactory.java	2009-12-19 01:15:52 UTC (rev 98002)
@@ -50,7 +50,7 @@
          throw new IllegalStateException("AOPClassPoolFactory can be used only after delegateClassPoolFactory is defined");
       }
       AbstractClassPool delegate = delegateClassPoolFactory.create(cl, src, repository);
-      return new AOPClassPool(delegate);
+      return delegate == null? null: new AOPClassPool(delegate);
    }
 
    public AOPClassPool create(ClassPool src, ScopedClassPoolRepository repository)
@@ -60,6 +60,6 @@
          throw new IllegalStateException("AOPClassPoolFactory can be used only after delegateClassPoolFactory is defined");
       }
       AbstractClassPool delegate = delegateClassPoolFactory.create(src, repository);
-      return new AOPClassPool(delegate);
+      return delegate == null? null: new AOPClassPool(delegate);
    }   
 }