[jboss-cvs] JBossAS SVN: r103399 - projects/aop/branches/Branch_2_2/aop/src/main/java/org/jboss/aop/proxy.

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

Author: flavia.rainone at jboss.com
Date: 2010-04-01 03:07:30 -0400 (Thu, 01 Apr 2010)
New Revision: 103399

Modified:
   projects/aop/branches/Branch_2_2/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java
Log:
[JBAOP-784] Carlo's patch

Modified: projects/aop/branches/Branch_2_2/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java
===================================================================
--- projects/aop/branches/Branch_2_2/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java	2010-04-01 07:05:55 UTC (rev 103398)
+++ projects/aop/branches/Branch_2_2/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java	2010-04-01 07:07:30 UTC (rev 103399)
@@ -47,6 +47,7 @@
 import org.jboss.aop.instrument.Instrumentor;
 import org.jboss.aop.instrument.TransformerCommon;
 import org.jboss.aop.util.JavassistMethodHashing;
+import org.jboss.aop.util.MethodHashing;
 import org.jboss.aop.util.reference.MethodPersistentReference;
 import org.jboss.aop.util.reference.PersistentReference;
 import org.jboss.util.collection.WeakValueHashMap;
@@ -363,7 +364,14 @@
    throws Exception
    {
       if (superclass == null) return;
-      if (superclass.getName().equals("java.lang.Object")) return;
+      if (superclass.getName().equals("java.lang.Object"))
+      {
+         // TODO: this is always the same for everyone, so why not prefab it
+         Method toString = Object.class.getDeclaredMethod("toString");
+         long hash = MethodHashing.methodHash(toString);
+         advised.put(hash, new MethodPersistentReference(toString, PersistentReference.REFERENCE_WEAK));
+         return;
+      };
 
       Method[] declaredMethods = superclass.getDeclaredMethods();
       for (int i = 0; i < declaredMethods.length; i++)