aboutsummaryrefslogtreecommitdiff
path: root/src/share/vm/runtime/fieldDescriptor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/share/vm/runtime/fieldDescriptor.cpp')
-rw-r--r--src/share/vm/runtime/fieldDescriptor.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/share/vm/runtime/fieldDescriptor.cpp b/src/share/vm/runtime/fieldDescriptor.cpp
index 54a225a5f..23d679494 100644
--- a/src/share/vm/runtime/fieldDescriptor.cpp
+++ b/src/share/vm/runtime/fieldDescriptor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -67,13 +67,10 @@ AnnotationArray* fieldDescriptor::annotations() const {
AnnotationArray* fieldDescriptor::type_annotations() const {
InstanceKlass* ik = field_holder();
- Annotations* type_annos = ik->type_annotations();
+ Array<AnnotationArray*>* type_annos = ik->fields_type_annotations();
if (type_annos == NULL)
return NULL;
- Array<AnnotationArray*>* md = type_annos->fields_annotations();
- if (md == NULL)
- return NULL;
- return md->at(index());
+ return type_annos->at(index());
}
constantTag fieldDescriptor::initial_value_tag() const {