[jboss-cvs] javassist/src/main/javassist/scopedpool ...

[Shigeru Chiba]

  User: chiba   
  Date: 06/08/07 11:48:31

  Modified:    src/main/javassist/scopedpool  ScopedClassPool.java
  Log:
  fixed the bug reported as JASSIST-23.
  
  Revision  Changes    Path
  1.4       +4 -3      javassist/src/main/javassist/scopedpool/ScopedClassPool.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ScopedClassPool.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/scopedpool/ScopedClassPool.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ScopedClassPool.java	18 Jul 2006 14:46:25 -0000	1.3
  +++ ScopedClassPool.java	7 Aug 2006 15:48:31 -0000	1.4
  @@ -16,6 +16,7 @@
   package javassist.scopedpool;
   
   import java.lang.ref.WeakReference;
  +import java.security.ProtectionDomain;
   import java.util.Iterator;
   import java.util.Map;
   import javassist.CannotCompileException;
  @@ -30,7 +31,7 @@
    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
    * @author <a href="adrian at jboss.com">Adrian Brock</a>
    * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
   public class ScopedClassPool extends ClassPool {
       protected ScopedClassPoolRepository repository;
  @@ -261,7 +262,7 @@
        * @throws CannotCompileException
        *             for any error
        */
  -    public Class toClass(CtClass ct, ClassLoader loader)
  +    public Class toClass(CtClass ct, ClassLoader loader, ProtectionDomain domain)
               throws CannotCompileException {
           // We need to pass up the classloader stored in this pool, as the
           // default implementation uses the Thread context cl.
  @@ -276,6 +277,6 @@
           // org.apache.jsp. For classes belonging to org.apache.jsp,
           // JasperLoader does NOT delegate to its parent if it cannot find them.
           lockInCache(ct);
  -        return super.toClass(ct, getClassLoader0());
  +        return super.toClass(ct, getClassLoader0(), domain);
       }
   }