[jboss-cvs] JBossAS SVN: r60465 - in branches/Branch_AOP_1_5: build and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2007-02-09 13:13:42 -0500 (Fri, 09 Feb 2007)
New Revision: 60465

Modified:
   branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java
   branches/Branch_AOP_1_5/build/build-thirdparty.xml
Log:
Differentiate between null bootstrap classloader and gc'ed classloaders in class pool (handled in javassist ScopedClassPool)

Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java	2007-02-09 18:06:18 UTC (rev 60464)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java	2007-02-09 18:13:42 UTC (rev 60465)
@@ -44,7 +44,7 @@
    protected ConcurrentReaderHashMap generatedClasses = new ConcurrentReaderHashMap();
    
    protected ConcurrentReaderHashMap localResources = new ConcurrentReaderHashMap();
-
+   
    static 
    {
       ClassPool.doPruning = false;
@@ -53,13 +53,18 @@
    
    public AOPClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
    {
-      super(cl, src, repository);
+      this(cl, src, repository, false);
    }
 
    protected AOPClassPool(ClassPool src, ScopedClassPoolRepository repository)
    {
-      this(null, src, repository);
+      this(null, src, repository, true);
    }
+   
+   private AOPClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository, boolean isTemp)
+   {
+      super(cl, src, repository, isTemp);
+   }
 
    public void setClassLoader(ClassLoader cl)
    {

Modified: branches/Branch_AOP_1_5/build/build-thirdparty.xml
===================================================================
--- branches/Branch_AOP_1_5/build/build-thirdparty.xml	2007-02-09 18:06:18 UTC (rev 60464)
+++ branches/Branch_AOP_1_5/build/build-thirdparty.xml	2007-02-09 18:13:42 UTC (rev 60465)
@@ -90,7 +90,7 @@
       <componentref name="hsqldb" version="1.8.0.2"/>
       <componentref name="ibm-wsdl4j" version="1.5.2jboss"/>
       <componentref name="jacorb" version="2.2.3"/>
-      <componentref name="javassist" version="3.4.GA"/>
+      <componentref name="javassist" version="snapshot"/>
       <componentref name="jaxen" version="1.1beta4"/>
       <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
       <componentref name="jboss/cache" version="1.3.0.SP1"/>