1.1 --- a/src/share/vm/runtime/fieldDescriptor.cpp Fri Feb 08 16:56:03 2013 -0800
1.2 +++ b/src/share/vm/runtime/fieldDescriptor.cpp Mon Feb 11 14:06:22 2013 -0500
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -67,13 +67,10 @@
1.11
1.12 AnnotationArray* fieldDescriptor::type_annotations() const {
1.13 InstanceKlass* ik = field_holder();
1.14 - Annotations* type_annos = ik->type_annotations();
1.15 + Array<AnnotationArray*>* type_annos = ik->fields_type_annotations();
1.16 if (type_annos == NULL)
1.17 return NULL;
1.18 - Array<AnnotationArray*>* md = type_annos->fields_annotations();
1.19 - if (md == NULL)
1.20 - return NULL;
1.21 - return md->at(index());
1.22 + return type_annos->at(index());
1.23 }
1.24
1.25 constantTag fieldDescriptor::initial_value_tag() const {
