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

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

Author: flavia.rainone at jboss.com
Date: 2008-05-01 14:44:04 -0400 (Thu, 01 May 2008)
New Revision: 72952

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
Log:
[JBAOP-568] Now the reference to the generated class, inside JoinPointGenerator.GeneratedClassInfo, is removed.

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java	2008-05-01 18:39:23 UTC (rev 72951)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java	2008-05-01 18:44:04 UTC (rev 72952)
@@ -21,7 +21,6 @@
   */
 package org.jboss.aop.instrument;
 
-import java.lang.ref.WeakReference;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.security.AccessController;
@@ -1524,15 +1523,11 @@
    
    private class GeneratedClassInfo
    {
-      WeakReference<Class<?>> generated;
-      String generatedName;
       Object[] ctorParams;
       Constructor<?> publicConstructor;
       
       GeneratedClassInfo(Class<?> generated, AdviceSetups setups)
       {
-         this.generated = new WeakReference<Class<?>>(generated);
-         this.generatedName = generated.getName();
          AdviceSetup[] aroundSetups = setups.getByType(AdviceType.AROUND);
          int size = 0;
          if (aroundSetups != null)
@@ -1567,24 +1562,6 @@
          }
       }
       
-      private Class<?> getGenerated(ClassLoader classloader)
-      {
-         Class<?> generatedClass = generated.get();
-         if (generatedClass == null)
-         {
-            try
-            {
-               generatedClass = classloader.loadClass(generatedName);
-            }
-            catch (ClassNotFoundException e)
-            {
-               throw new RuntimeException("Unexpected exception: " + e, e);
-            }
-            generated = new WeakReference<Class<?>>(generatedClass);
-         }
-         return generatedClass;
-      }
-      
       Object createJoinPointInstance(ClassLoader classloader, JoinPointInfo info)
       {
          try
@@ -1595,13 +1572,8 @@
          catch (Exception e)
          {
             StringBuffer sb = new StringBuffer();
-//            Class advisedClass = info.getClazz();
-//            if (advisedClass != null)
-//            {
-//               sb.append("Target: " + advisedClass.getName() + " " + advisedClass.getClassLoader() + "\n");
-//            }
-            throw new RuntimeException(
-            debugClass(sb, publicConstructor.getDeclaringClass()).toString(), e);
+            throw new RuntimeException( debugClass(sb,
+                  publicConstructor.getDeclaringClass()).toString(), e);
          }
       }
    }