diff -r 36d1d483d5d6 -r da91efe96a93 src/share/vm/prims/jniCheck.hpp
--- a/src/share/vm/prims/jniCheck.hpp	Fri Aug 31 16:39:35 2012 -0700
+++ b/src/share/vm/prims/jniCheck.hpp	Sat Sep 01 13:25:18 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, 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
@@ -50,12 +50,12 @@
  public:
   static oop validate_handle(JavaThread* thr, jobject obj);
   static oop validate_object(JavaThread* thr, jobject obj);
-  static klassOop validate_class(JavaThread* thr, jclass clazz, bool allow_primitive = false);
+  static Klass* validate_class(JavaThread* thr, jclass clazz, bool allow_primitive = false);
   static void validate_class_descriptor(JavaThread* thr, const char* name);
-  static void validate_throwable_klass(JavaThread* thr, klassOop klass);
+  static void validate_throwable_klass(JavaThread* thr, Klass* klass);
   static void validate_call_object(JavaThread* thr, jobject obj, jmethodID method_id);
   static void validate_call_class(JavaThread* thr, jclass clazz, jmethodID method_id);
-  static methodOop validate_jmethod_id(JavaThread* thr, jmethodID method_id);
+  static Method* validate_jmethod_id(JavaThread* thr, jmethodID method_id);
 };
 
 #endif // SHARE_VM_PRIMS_JNICHECK_HPP