natClass.cc (parseAnnotationElement): Correct long annotations to read JV_CONSTANT_Long, not JV_CONSTANT_Double.

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.

From-SVN: r122545
This commit is contained in:
Andrew Haley 2007-03-05 11:33:46 +00:00 committed by Andrew Haley
parent f9be04cd95
commit 39cd07dfc7
2 changed files with 6 additions and 1 deletions

View File

@ -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:

View File

@ -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);