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

[Kabir Khan]

  User: kkhan   
  Date: 06/08/17 09:18:11

  Modified:    src/main/javassist/scopedpool  ScopedClassPool.java
  Log:
  getClassLoader0() should not throw an exception
  
  Revision  Changes    Path
  1.6       +7 -7      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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- ScopedClassPool.java	16 Aug 2006 15:59:34 -0000	1.5
  +++ ScopedClassPool.java	17 Aug 2006 13:18:11 -0000	1.6
  @@ -31,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.5 $
  + * @version $Revision: 1.6 $
    */
   public class ScopedClassPool extends ClassPool {
       protected ScopedClassPoolRepository repository;
  @@ -75,17 +75,17 @@
        * @return the class loader
        */
       public ClassLoader getClassLoader() {
  -        return getClassLoader0();
  -    }
  -
  -    protected ClassLoader getClassLoader0() {
  -        ClassLoader cl = (ClassLoader)classLoader.get();
  +       ClassLoader cl = getClassLoader0();
           if (cl == null)
               throw new IllegalStateException(
                       "ClassLoader has been garbage collected");
           return cl;
       }
   
  +    protected ClassLoader getClassLoader0() {
  +       return (ClassLoader)classLoader.get();
  +    }
  +
       /**
        * Close the class pool
        */