From: aph Date: Mon, 5 Mar 2007 11:33:46 +0000 (+0000) Subject: 2007-03-03 Andrew Haley X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=948dec911b94ed4a3e0b2b032791b745110346db;p=thirdparty%2Fgcc.git 2007-03-03 Andrew Haley * java/lang/natClass.cc (parseAnnotationElement): Correct long annotations to read JV_CONSTANT_Long, not JV_CONSTANT_Double. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122545 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index bddc99863022..c595a229d710 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2007-03-03 Andrew Haley + + * java/lang/natClass.cc (parseAnnotationElement): Correct long + annotations to read JV_CONSTANT_Long, not JV_CONSTANT_Double. + 2007-03-02 Andrew Haley * sun/reflect/annotation/AnnotationInvocationHandler.java: diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index ea55546d8970..078f8422b26d 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);