[jboss-cvs] JBossAS SVN: r70492 - projects/aop/trunk/aop/src/main/org/jboss/aop/advice.

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

Author: kabir.khan at jboss.com
Date: 2008-03-06 11:02:47 -0500 (Thu, 06 Mar 2008)
New Revision: 70492

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectFactoryWithClassLoaderSupport.java
Log:
Generify

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectFactoryWithClassLoaderSupport.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectFactoryWithClassLoaderSupport.java	2008-03-06 15:56:21 UTC (rev 70491)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectFactoryWithClassLoaderSupport.java	2008-03-06 16:02:47 UTC (rev 70492)
@@ -35,10 +35,10 @@
 public abstract class AspectFactoryWithClassLoaderSupport implements AspectFactory, AspectFactoryWithClassLoader
 {
    private static final Logger logger = AOPLogger.getLogger(AspectFactoryWithClassLoaderSupport.class);
-   private WeakReference loader;
+   private WeakReference<ClassLoader> loader;
    
    /** If a scoped classloader with no parent delegation redefines the class, we need to make sure that that class is pushed on the stack */
-   private ThreadLocal scopedClassLoader = new ThreadLocal();
+   private ThreadLocal<ClassLoader> scopedClassLoader = new ThreadLocal<ClassLoader>();
    
    protected AspectFactoryWithClassLoaderSupport()
    {
@@ -46,7 +46,7 @@
 
    public void setClassLoader(ClassLoader cl)
    {
-      this.loader = new WeakReference(cl);
+      this.loader = new WeakReference<ClassLoader>(cl);
    }
    
    protected ClassLoader getLoader()
@@ -58,7 +58,7 @@
       }
       if (loader != null)
       {
-         return (ClassLoader)loader.get();
+         return loader.get();
       }
       return null;
    }
@@ -75,10 +75,10 @@
    
    public ClassLoader peekScopedClassLoader()
    {
-      return (ClassLoader)scopedClassLoader.get();
+      return scopedClassLoader.get();
    }
 
-   protected Class loadClass(String name) throws ClassNotFoundException
+   protected Class<?> loadClass(String name) throws ClassNotFoundException
    {
       ClassLoader cl = getLoader();
       if (cl == null)