archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 17:44:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8165753: Custom security manager, crashing wth 'java/security/AccessControlException'

Browse source 
Reviewed-by: dholmes, dcubed
This commit is contained in:
Vladimir Kempik 2017-02-17 02:31:12 +00:00
parent 8698102379
commit bf9a4cd8fb
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hotspot/src/share/vm/runtime/os.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -347,10 +347,9 @@ void os::init_before_ergo() {
VM_Version::init_before_ergo(); VM_Version::init_before_ergo();
} }
void os::signal_init() { void os::signal_init(TRAPS) {
if (!ReduceSignalUsage) { if (!ReduceSignalUsage) {
// Setup JavaThread for processing signals // Setup JavaThread for processing signals
EXCEPTION_MARK;
Klass* k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_Thread(), true, CHECK); Klass* k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_Thread(), true, CHECK);
instanceKlassHandle klass (THREAD, k); instanceKlassHandle klass (THREAD, k);
instanceHandle thread_oop = klass->allocate_instance_handle(CHECK); instanceHandle thread_oop = klass->allocate_instance_handle(CHECK);

4
hotspot/src/share/vm/runtime/os.hpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -731,7 +731,7 @@ class os: AllStatic {
static struct hostent* get_host_by_name(char* name); static struct hostent* get_host_by_name(char* name);
// Support for signals (see JVM_RaiseSignal, JVM_RegisterSignal) // Support for signals (see JVM_RaiseSignal, JVM_RegisterSignal)
static void signal_init(); static void signal_init(TRAPS);
static void signal_init_pd(); static void signal_init_pd();
static void signal_notify(int signal_number); static void signal_notify(int signal_number);
static void* signal(int signal_number, void* handler); static void* signal(int signal_number, void* handler);

4
hotspot/src/share/vm/runtime/thread.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -3717,7 +3717,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
#endif // INCLUDE_MANAGEMENT #endif // INCLUDE_MANAGEMENT
// Signal Dispatcher needs to be started before VMInit event is posted // Signal Dispatcher needs to be started before VMInit event is posted
os::signal_init(); os::signal_init(CHECK_JNI_ERR);
// Start Attach Listener if +StartAttachListener or it can't be started lazily // Start Attach Listener if +StartAttachListener or it can't be started lazily
if (!DisableAttachMechanism) { if (!DisableAttachMechanism) {