8145845: [AOT] NullPointerException in compiler/whitebox/GetCodeHeapEntriesTest.java

Reviewed-by: kvn, thartmann
This commit is contained in:
Igor Ignatyev 2019-02-12 11:23:43 -08:00
parent 61882ce51f
commit 328fae7880
2 changed files with 2 additions and 5 deletions
src/hotspot/share/prims
test/hotspot/jtreg/compiler/whitebox

@ -1544,9 +1544,6 @@ WB_ENTRY(jobjectArray, WB_GetCodeHeapEntries(JNIEnv* env, jobject o, jint blob_t
blobs.append(stub);
}
}
if (blobs.length() == 0) {
return NULL;
}
ThreadToNativeFromVM ttn(thread);
jobjectArray result = NULL;
jclass clazz = env->FindClass(vmSymbols::java_lang_Object()->as_C_string());

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2019, 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
@ -77,7 +77,7 @@ public class GetCodeHeapEntriesTest {
CodeBlob blob = Arrays.stream(blobs)
.filter(GetCodeHeapEntriesTest::filter)
.findAny()
.get();
.orElse(null);
Asserts.assertNotNull(blob);
Asserts.assertEQ(blob.code_blob_type, type);
Asserts.assertGTE(blob.size, SIZE);