[jboss-cvs] JBossCache/src/org/jboss/cache/pojo/collection ...

[Jason Thomas Greene]

  User: jgreene 
  Date: 07/06/20 21:33:03

  Modified:    src/org/jboss/cache/pojo/collection 
                        CollectionInterceptorUtil.java
  Log:
  Fix JBCACHE-1057
  
  Revision  Changes    Path
  1.4       +8 -4      JBossCache/src/org/jboss/cache/pojo/collection/CollectionInterceptorUtil.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CollectionInterceptorUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/pojo/collection/CollectionInterceptorUtil.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- CollectionInterceptorUtil.java	13 Jun 2007 00:08:59 -0000	1.3
  +++ CollectionInterceptorUtil.java	21 Jun 2007 01:33:03 -0000	1.4
  @@ -159,9 +159,9 @@
      }
   
      public static Object invoke(Invocation invocation,
  -                               Object interceptor,
  -                               Map methodMap,
  -                               Map managedMethods)
  +                               AbstractCollectionInterceptor interceptor,
  +                               Object impl,
  +                               Map methodMap, Map managedMethods)
              throws Throwable
      {
   
  @@ -179,7 +179,11 @@
               Object[] args = methodInvocation.getArguments();
               if (method != null)
               {
  -               return method.invoke(interceptor, args);
  +               // No need to validate toString()
  +               if (method.getDeclaringClass() != Object.class)
  +                  interceptor.verifyAttached(impl);
  +
  +               return method.invoke(impl, args);
               } else
               {
                  method = methodInvocation.getMethod();