[jboss-cvs] javassist/src/main/javassist/compiler ...

[Shigeru Chiba]

  User: chiba   
  Date: 09/04/02 23:37:48

  Modified:    src/main/javassist/compiler  MemberCodeGen.java
  Log:
  JASSIST-76
  
  Revision  Changes    Path
  1.32      +12 -6     javassist/src/main/javassist/compiler/MemberCodeGen.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MemberCodeGen.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/compiler/MemberCodeGen.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -b -r1.31 -r1.32
  --- MemberCodeGen.java	4 Jun 2007 03:11:09 -0000	1.31
  +++ MemberCodeGen.java	3 Apr 2009 03:37:48 -0000	1.32
  @@ -632,13 +632,19 @@
           }
           else if (isSpecial)    // if (isSpecial && notStatic(acc))
               bytecode.addInvokespecial(declClass, mname, desc);
  -        else if (declClass.isInterface())
  +        else {
  +            if (!Modifier.isPublic(declClass.getModifiers())
  +                || declClass.isInterface() != targetClass.isInterface())
  +                declClass = targetClass;
  +
  +            if (declClass.isInterface())
               bytecode.addInvokeinterface(declClass, mname, desc, count);
           else
               if (isStatic)
                   throw new CompileError(mname + " is not static");
               else
                   bytecode.addInvokevirtual(declClass, mname, desc);
  +        }
   
           setReturnType(desc, isStatic, popTarget);
       }