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

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

Author: kabir.khan at jboss.com
Date: 2008-03-13 21:06:52 -0400 (Thu, 13 Mar 2008)
New Revision: 70854

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/JoinPointInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/MethodInfo.java
Log:
Work around EJB 3 using us the wrong way

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java	2008-03-13 23:56:31 UTC (rev 70853)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java	2008-03-14 01:06:52 UTC (rev 70854)
@@ -188,8 +188,16 @@
 
       for (int i = 0; i < classMetaDataBindings.size(); i++)
       {
-         ClassMetaDataBinding data = classMetaDataBindings.get(i);
-         bindClassMetaData(data);
+         try
+         {
+            ClassMetaDataBinding data = classMetaDataBindings.get(i);
+            bindClassMetaData(data);
+         }
+         catch (ClassCastException e)
+         {
+            //This is for EJB3. It is putting the SerializedConcurrentAccess into the list 
+            logger.warn("Invalid object found in classMetaDataBindings map. The type was " + e.getMessage());
+         }
       }
    }
 

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/JoinPointInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/JoinPointInfo.java	2008-03-13 23:56:31 UTC (rev 70853)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/JoinPointInfo.java	2008-03-14 01:06:52 UTC (rev 70854)
@@ -35,7 +35,8 @@
 {
    private ReentrantReadWriteLock interceptorChainLock = new ReentrantReadWriteLock();
    
-   private Interceptor[] interceptors;
+   /** @deprecated Use the accessors. Only public for backwards compatiblity with EJB3*/
+   public Interceptor[] interceptors;
 
    private ArrayList<Interceptor> interceptorChain = new ArrayList<Interceptor>();
    
@@ -61,6 +62,7 @@
    /*
     * For copying
     */
+   @SuppressWarnings("deprecation")
    protected JoinPointInfo(JoinPointInfo other)
    {
       this.advisor = other.advisor;
@@ -73,6 +75,7 @@
       if (other.interceptorChain != null)this.interceptorChain.addAll(interceptorChain);
    }
 
+   @SuppressWarnings("deprecation")
    protected void clear()
    {
       interceptorChain.clear();
@@ -158,6 +161,7 @@
       }
    }
 
+   @SuppressWarnings("deprecation")
    public Interceptor[] getInterceptors() {
       this.interceptorChainLock.readLock().lock();
       try
@@ -170,6 +174,7 @@
       }
    }
 
+   @SuppressWarnings("deprecation")
    public void setInterceptors(Interceptor[] interceptors) {
       this.interceptorChainLock.writeLock().lock();
       adviceString = null;
@@ -200,6 +205,7 @@
       return null;
    }
    
+   @SuppressWarnings("deprecation")
    public void cloneChains(JoinPointInfo other)
    {
       this.interceptorChainLock.writeLock().lock();
@@ -223,6 +229,7 @@
       }
    }
    
+   @SuppressWarnings("deprecation")
    public String getAdviceString()
    {
       if (adviceString == null)

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/MethodInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/MethodInfo.java	2008-03-13 23:56:31 UTC (rev 70853)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/MethodInfo.java	2008-03-14 01:06:52 UTC (rev 70854)
@@ -35,13 +35,15 @@
 public class MethodInfo extends JoinPointInfo implements MethodExecution
 {
    private Method advisedMethod;
-   private Method unadvisedMethod;
+   /** @deprecated Use the accessors. Only public for backwards compatiblity with EJB3*/
+   public Method unadvisedMethod;
    private long hash;
    
    public MethodInfo()
    {
    }
    
+   @SuppressWarnings("deprecation")
    public MethodInfo(Class<?> clazz, long hash, long unadvisedHash, Advisor advisor)
    {
       super(advisor, clazz);
@@ -62,6 +64,7 @@
    /*
     * For copying
     */
+   @SuppressWarnings("deprecation")
    private MethodInfo(MethodInfo other)
    {
       super(other);
@@ -105,11 +108,13 @@
       this.hash = hash;
    }
 
+   @SuppressWarnings("deprecation")
    public Method getUnadvisedMethod() 
    {
       return unadvisedMethod;
    }
 
+   @SuppressWarnings("deprecation")
    public void setUnadvisedMethod(Method unadvisedMethod) {
       this.unadvisedMethod = unadvisedMethod;
    }