[jboss-cvs] JBossCache/src-50/resources ...

[Ben Wang]

  User: bwang   
  Date: 06/11/09 11:52:47

  Modified:    src-50/resources  pojocache-aop.xml
  Log:
  Added detection for Collection hashCode recursion.
  
  Revision  Changes    Path
  1.6       +15 -3     JBossCache/src-50/resources/pojocache-aop.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: pojocache-aop.xml
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src-50/resources/pojocache-aop.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- pojocache-aop.xml	8 Nov 2006 08:46:19 -0000	1.5
  +++ pojocache-aop.xml	9 Nov 2006 16:52:47 -0000	1.6
  @@ -53,8 +53,15 @@
                   scope="PER_INSTANCE"/>
   
      <!-- Interceptor to used to check recursive field interception. -->
  -   <interceptor name="Reentrant" class="org.jboss.cache.pojo.interceptors.MethodReentrancyStopperInterceptor"
  -                scope="PER_INSTANCE"/>
  +   <interceptor name="ReentrantToString" class="org.jboss.cache.pojo.interceptors.MethodReentrancyStopperInterceptor"
  +                scope="PER_INSTANCE">
  +               <attribute name="MethodName">toString</attribute>
  +   </interceptor>
  +
  +   <interceptor name="ReentrantHashCode" class="org.jboss.cache.pojo.interceptors.MethodReentrancyStopperInterceptor"
  +                scope="PER_INSTANCE">
  +               <attribute name="MethodName">hashCode</attribute>
  +   </interceptor>
   
      <!-- Whether to allow non-serializable pojo. Default is false. -->
      <interceptor name="MarshallNonSerializable"
  @@ -97,7 +104,12 @@
      <!-- This binds the jointpoint to specific in-memory operations. Currently in PojoUtil. -->
      <bind pointcut="execution(*
         @org.jboss.cache.pojo.annotation.Reentrant->toString())">
  -      <interceptor-ref name="Reentrant"/>
  +      <interceptor-ref name="ReentrantToString"/>
  +   </bind>
  +
  +   <bind pointcut="execution(*
  +      @org.jboss.cache.pojo.annotation.Reentrant->hashCode())">
  +      <interceptor-ref name="ReentrantHashCode"/>
      </bind>
   
      <bind pointcut="execution(*