*** old/src/share/vm/prims/jniCheck.cpp	Fri Mar 18 14:59:02 2011
--- new/src/share/vm/prims/jniCheck.cpp	Fri Mar 18 14:59:02 2011

*** 1,7 ****
--- 1,7 ----
  /*
!  * 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 222,233 ****
--- 222,232 ----
    klassOop f_oop = id->holder();
    if (!instanceKlass::cast(k_oop)->is_subtype_of(f_oop))
      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)) {
      ReportJNIFatalError(thr, fatal_static_field_mismatch);
    }