summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/lang/natClass.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index bddc9986302..c595a229d71 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-03 Andrew Haley <aph@redhat.com>
+
+ * java/lang/natClass.cc (parseAnnotationElement): Correct long
+ annotations to read JV_CONSTANT_Long, not JV_CONSTANT_Double.
+
2007-03-02 Andrew Haley <aph@redhat.com>
* sun/reflect/annotation/AnnotationInvocationHandler.java:
diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index ea55546d897..078f8422b26 100644
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -1150,7 +1150,7 @@ parseAnnotationElement(jclass klass, _Jv_Constants *pool,
case 'J':
{
int cindex = read_u2 (bytes, last);
- check_constant (pool, cindex, JV_CONSTANT_Double);
+ check_constant (pool, cindex, JV_CONSTANT_Long);
_Jv_word2 word;
memcpy (&word, &pool->data[cindex], 2 * sizeof (_Jv_word));
result = Long::valueOf (word.l);
OpenPOWER on IntegriCloud