[jboss-cvs] javassist/src/main/javassist/util/proxy ...

[Shigeru Chiba]

  User: chiba   
  Date: 06/07/18 13:51:04

  Modified:    src/main/javassist/util/proxy  ProxyFactory.java
  Log:
  a correct fix of HIBERNATE-37 (ProxyFactory could not handle a bridge method).  Please check other JBoss products using Javassist.
  
  Revision  Changes    Path
  1.12      +2 -2      javassist/src/main/javassist/util/proxy/ProxyFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ProxyFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/util/proxy/ProxyFactory.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- ProxyFactory.java	12 Jul 2006 16:19:30 -0000	1.11
  +++ ProxyFactory.java	18 Jul 2006 17:51:04 -0000	1.12
  @@ -363,6 +363,8 @@
           else {
               MethodInfo delegator
                   = makeDelegator(meth, desc, cp, declClass, delegatorName);
  +            // delegator is not a bridge method.  See Sec. 15.12.4.5 of JLS 3rd Ed.
  +            delegator.setAccessFlags(delegator.getAccessFlags() & ~AccessFlag.BRIDGE);
               cf.addMethod(delegator);
           }
   
  @@ -417,8 +419,6 @@
        * @param mod       the modifiers of the method. 
        */
       private static boolean isVisible(int mod, String from, Member meth) {
  -        if ((mod & Modifier.VOLATILE) != 0)
  -         return false;
           if ((mod & Modifier.PRIVATE) != 0)
               return false;
           else if ((mod & (Modifier.PUBLIC | Modifier.PROTECTED)) != 0)