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

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

Author: flavia.rainone at jboss.com
Date: 2009-09-30 15:21:06 -0400 (Wed, 30 Sep 2009)
New Revision: 94180

Modified:
   projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/SortedCFlowInterceptor.java
Log:
[JBAOP-752] Refactored SortedCFlowInterceptor so it is equal to the version at Branch_2_1

Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/SortedCFlowInterceptor.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/SortedCFlowInterceptor.java	2009-09-30 19:17:13 UTC (rev 94179)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/SortedCFlowInterceptor.java	2009-09-30 19:21:06 UTC (rev 94180)
@@ -80,15 +80,7 @@
          }
       }
       
-      this.chains = new LinkedHashMap<Integer, Interceptor[]>(2, 1, true){
-        private static final long serialVersionUID = 1L;
-
-      @Override
-        protected boolean removeEldestEntry(Entry<Integer,Interceptor[]> eldest)
-        {
-           return size() > 5;
-        }
-      };
+      this.chains = new ChainCache(2, 1, true);
       this.cflows = cflowSet.toArray(new CachedCFlow[cflowSet.size()]);
    }
    
@@ -154,4 +146,20 @@
          return this.matches;
       }
    }
+
+   @SuppressWarnings("serial")
+   private static class ChainCache extends LinkedHashMap<Integer, Interceptor[]>
+   {
+      //This class MUST use default serial version id see JBAOP-752
+      public ChainCache(int initialCapacity, float loadFactor, boolean accessOrder)
+      {
+         super(initialCapacity, loadFactor, accessOrder);
+      }
+
+      @Override
+      protected boolean removeEldestEntry(Entry<Integer,Interceptor[]> eldest)
+      {
+         return size() > 5;
+      }
+   }
 }
\ No newline at end of file