fixed a bug in write() in Annotation and ClassMemberValue

git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@309 30ef5769-5b8d-40dd-aea6-55b5d6557bb3

diff --git a/src/main/javassist/bytecode/annotation/Annotation.java b/src/main/javassist/bytecode/annotation/Annotation.java
index 9971fada127a5d39eeace598b6f633a3a2eec489..4b00a318c7924525686756272f065590f77e9330 100644 (file)
--- a/src/main/javassist/bytecode/annotation/Annotation.java
+++ b/src/main/javassist/bytecode/annotation/Annotation.java
@@ -289,12 +289,13 @@ public class Annotation {
      * @param writer            the output.
      */
     public void write(AnnotationsWriter writer) throws IOException {
+        String typeName = pool.getUtf8Info(typeIndex);
         if (members == null) {
-            writer.annotation(typeIndex, 0);
+            writer.annotation(typeName, 0);
             return;
         }
 
-        writer.annotation(typeIndex, members.size());
+        writer.annotation(typeName, members.size());
         Iterator it = members.values().iterator();
         while (it.hasNext()) {
             Pair pair = (Pair)it.next();

diff --git a/src/main/javassist/bytecode/annotation/ClassMemberValue.java b/src/main/javassist/bytecode/annotation/ClassMemberValue.java
index 19b4714b68e2761fcf9bfaa5187d5b40f8badcda..c29dbb207774cc6963869753537233c3b2cf3191 100644 (file)
--- a/src/main/javassist/bytecode/annotation/ClassMemberValue.java
+++ b/src/main/javassist/bytecode/annotation/ClassMemberValue.java
@@ -120,7 +120,7 @@ public class ClassMemberValue extends MemberValue {
      * Writes the value.
      */
     public void write(AnnotationsWriter writer) throws IOException {
-        writer.classInfoIndex(valueIndex);
+        writer.classInfoIndex(cp.getUtf8Info(valueIndex));
     }
 
     /**