Mercurial > hg > openjdk > hsx17
changeset 1328:2b971d302bbe
Merge
author | dcubed |
---|---|
date | Mon, 17 May 2010 07:44:41 -0700 |
parents | e3b128efead1 (current diff) d3562366cbfd (diff) |
children | 8bc86dd08b8a |
files | src/share/vm/runtime/jniHandles.hpp |
diffstat | 1 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/runtime/jniHandles.hpp Wed May 05 09:28:13 2010 -0400 +++ b/src/share/vm/runtime/jniHandles.hpp Mon May 17 07:44:41 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, 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 @@ -63,8 +63,14 @@ // refers to NULL (as is the case for any weak reference). static jmethodID make_jmethod_id(methodHandle mh); static void destroy_jmethod_id(jmethodID mid); + // Use resolve_jmethod_id() in situations where the caller is expected + // to provide a valid jmethodID; the only sanity checks are in asserts; + // result guaranteed not to be NULL. inline static methodOop resolve_jmethod_id(jmethodID mid); - inline static methodOop checked_resolve_jmethod_id(jmethodID mid); // NULL on invalid jmethodID + // Use checked_resolve_jmethod_id() in situations where the caller + // should provide a valid jmethodID, but might not. NULL is returned + // when the jmethodID does not refer to a valid method. + inline static methodOop checked_resolve_jmethod_id(jmethodID mid); static void change_method_associated_with_jmethod_id(jmethodID jmid, methodHandle mh); // Sentinel marking deleted handles in block. Note that we cannot store NULL as @@ -200,12 +206,8 @@ }; inline methodOop JNIHandles::checked_resolve_jmethod_id(jmethodID mid) { - if (mid == NULL) { - return (methodOop) NULL; - } - - oop o = resolve_non_null((jobject) mid); - if (!o->is_method()) { + oop o = resolve_external_guard((jobject) mid); + if (o == NULL || !o->is_method()) { return (methodOop) NULL; }