[Jboss-cvs] JBossAS SVN: r55912 - branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment

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

Author: kabir.khan at jboss.com
Date: 2006-08-14 15:27:36 -0400 (Mon, 14 Aug 2006)
New Revision: 55912

Modified:
   branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment/JBossClassPool.java
   branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment/JBossClassPool32.java
Log:
Add fixes to work with latest javassist

Modified: branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment/JBossClassPool.java
===================================================================
--- branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment/JBossClassPool.java	2006-08-14 19:23:53 UTC (rev 55911)
+++ branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment/JBossClassPool.java	2006-08-14 19:27:36 UTC (rev 55912)
@@ -23,6 +23,8 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.security.ProtectionDomain;
+
 import org.jboss.aop.AOPClassPool;
 import org.jboss.aop.AspectManager;
 import org.jboss.mx.loading.RepositoryClassLoader;
@@ -69,14 +71,14 @@
 
    
 
-   public Class toClass(CtClass cc, ClassLoader loader)
+   public Class toClass(CtClass cc, ClassLoader loader, ProtectionDomain domain)
    throws CannotCompileException
    {
       lockInCache(cc);
 	  ClassLoader dcl = super.getClassLoader();
       if (dcl == null || tempdir == null)
       {
-         return super.toClass(cc);
+         return super.toClass(cc, loader, domain);
       }
       Class dynClass = null;
       try

Modified: branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment/JBossClassPool32.java
===================================================================
--- branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment/JBossClassPool32.java	2006-08-14 19:23:53 UTC (rev 55911)
+++ branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment/JBossClassPool32.java	2006-08-14 19:27:36 UTC (rev 55912)
@@ -23,6 +23,8 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.security.ProtectionDomain;
+
 import org.jboss.aop.AOPClassPool;
 import org.jboss.aop.AspectManager;
 import org.jboss.mx.loading.UnifiedClassLoader;
@@ -67,10 +69,10 @@
       return false;
    }
 
-   public Class toClass(CtClass cc, ClassLoader loader)
-           throws CannotCompileException
+   public Class toClass(CtClass cc, ClassLoader loader, ProtectionDomain domain)
+   throws CannotCompileException
    {
-      lockInCache(cc);
+       lockInCache(cc);
 	  ClassLoader dcl = super.getClassLoader();
       if (dcl == null || tempdir == null)
       {