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

[Kabir Khan]

  User: kkhan   
  Date: 07/03/08 08:05:47

  Modified:    src/main/javassist/bytecode    FieldInfo.java
                        MethodInfo.java ClassFile.java
  Log:
  When pruning preserve the SignatureAttribute
  
  Revision  Changes    Path
  1.19      +7 -0      javassist/src/main/javassist/bytecode/FieldInfo.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FieldInfo.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/bytecode/FieldInfo.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- FieldInfo.java	11 Jan 2006 06:45:56 -0000	1.18
  +++ FieldInfo.java	8 Mar 2007 13:05:47 -0000	1.19
  @@ -100,6 +100,13 @@
               newAttributes.add(visibleAnnotations);
           }
   
  +        AttributeInfo signature 
  +            = getAttribute(SignatureAttribute.tag);
  +        if (signature != null) {
  +            signature = signature.copy(cp, null);
  +            newAttributes.add(signature);
  +        }
  +        
           int index = getConstantValue();
           if (index != 0) {
               index = constPool.copy(index, cp, null);
  
  
  
  1.24      +7 -0      javassist/src/main/javassist/bytecode/MethodInfo.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MethodInfo.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/bytecode/MethodInfo.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- MethodInfo.java	15 Mar 2006 17:59:07 -0000	1.23
  +++ MethodInfo.java	8 Mar 2007 13:05:47 -0000	1.24
  @@ -164,6 +164,13 @@
           if (ea != null)
               newAttributes.add(ea);
   
  +        AttributeInfo signature 
  +            = getAttribute(SignatureAttribute.tag);
  +        if (signature != null) {
  +            signature = signature.copy(cp, null);
  +            newAttributes.add(signature);
  +        }
  +        
           attribute = newAttributes;
           name = cp.addUtf8Info(getName());
           descriptor = cp.addUtf8Info(getDescriptor());
  
  
  
  1.29      +7 -0      javassist/src/main/javassist/bytecode/ClassFile.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ClassFile.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/bytecode/ClassFile.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -b -r1.28 -r1.29
  --- ClassFile.java	7 Nov 2006 04:19:37 -0000	1.28
  +++ ClassFile.java	8 Mar 2007 13:05:47 -0000	1.29
  @@ -168,6 +168,13 @@
               newAttributes.add(visibleAnnotations);
           }
   
  +        AttributeInfo signature 
  +            = getAttribute(SignatureAttribute.tag);
  +        if (signature != null) {
  +            signature = signature.copy(cp, null);
  +            newAttributes.add(signature);
  +        }
  +        
           ArrayList list = methods;
           int n = list.size();
           for (int i = 0; i < n; ++i) {