--- a/hotspot/src/share/vm/prims/jniCheck.cpp Fri Mar 18 15:52:42 2011 -0700
+++ b/hotspot/src/share/vm/prims/jniCheck.cpp Fri Mar 18 16:00:34 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2011, 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
@@ -224,8 +224,7 @@
ReportJNIFatalError(thr, fatal_wrong_static_field);
/* check for proper field type */
- if (!instanceKlass::cast(f_oop)->find_local_field_from_offset(
- id->offset(), true, &fd))
+ if (!id->find_local_field(&fd))
ReportJNIFatalError(thr, fatal_static_field_not_found);
if ((fd.field_type() != ftype) &&
!(fd.field_type() == T_ARRAY && ftype == T_OBJECT)) {