aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Haley <aph@redhat.com>2006-11-01 17:06:36 +0000
committerAndrew Haley <aph@redhat.com>2006-11-01 17:06:36 +0000
commit1611421c99e2ad2d6e61f6f33368ddab97296c06 (patch)
tree9af76ace921fb8c305b7ac24e8eb149c35931bb3
parent5fd7f60fddaec2d8a188699e8fa99d9149aa3599 (diff)
2006-11-01 Andrew Haley <aph@redhat.com>
* java/lang/natClass.cc (parseAnnotationElement): Set result from anno_class. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcj-eclipse@118388 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/lang/natClass.cc1
2 files changed, 6 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 97a6806e10e..b056c96a28e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-01 Andrew Haley <aph@redhat.com>
+
+ * java/lang/natClass.cc (parseAnnotationElement): Set result from
+ anno_class.
+
2006-10-21 Tom Tromey <tromey@redhat.com>
* testsuite/libjava.lang/PR260.out: Rewrote for 1.5.
diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index 819b1e535dd..99a9e9d92f7 100644
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -1181,6 +1181,7 @@ parseAnnotationElement(jclass klass, _Jv_Constants *pool,
if (! anno_class)
// FIXME: original exception...
throw new TypeNotPresentException(u_name->toString(), NULL);
+ result = anno_class;
}
break;
case '@':