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

[Jason Thomas Greene]

  User: jgreene 
  Date: 08/06/02 23:47:18

  Modified:    src/main/javassist/convert  TransformAccessArrayField.java
  Log:
  Fix small naming bug (classinfo expects a jvm name)
  Add test to catch it
  
  Revision  Changes    Path
  1.6       +196 -194  javassist/src/main/javassist/convert/TransformAccessArrayField.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TransformAccessArrayField.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/convert/TransformAccessArrayField.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- TransformAccessArrayField.java	24 May 2008 05:12:59 -0000	1.5
  +++ TransformAccessArrayField.java	3 Jun 2008 03:47:18 -0000	1.6
  @@ -15,12 +15,14 @@
   package javassist.convert;
   
   import javassist.CannotCompileException;
  +import javassist.ClassPool;
   import javassist.CtClass;
   import javassist.NotFoundException;
   import javassist.CodeConverter.ArrayAccessReplacementMethodNames;
   import javassist.bytecode.BadBytecode;
   import javassist.bytecode.CodeIterator;
   import javassist.bytecode.ConstPool;
  +import javassist.bytecode.Descriptor;
   import javassist.bytecode.MethodInfo;
   import javassist.bytecode.analysis.Analyzer;
   import javassist.bytecode.analysis.Frame;
  @@ -30,7 +32,7 @@
    * 
    * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
    * @author Jason T. Greene
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public final class TransformAccessArrayField extends Transformer {
   	private final String methodClassname;
  @@ -117,7 +119,7 @@
   	        return null;
   	    
   	    CtClass clazz = frame.peek().getCtClass();
  -	    return clazz != null ? clazz.getName() : null;
  +        return clazz != null ? Descriptor.toJvmName(clazz) : null;
   	}
   
   	private int replace(ConstPool cp, CodeIterator iterator, int pos,
  @@ -133,7 +135,7 @@
   		        // So we don't really care about this case. 
   		        if (castType == null)
   		            return pos; 
  -		        if ("java.lang.Object".equals(castType))
  +                if ("java/lang/Object".equals(castType))
   		            castType = null;
   		    }