archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8228336: Refactor native library loading implementation

Browse source 
Reviewed-by: alanb, dholmes
This commit is contained in:
Mandy Chung 2020-03-12 11:54:11 -07:00
parent 36fac8c332
commit d5d6dc0caa
16 changed files with 817 additions and 617 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/java.base/share/classes/java/lang/Runtime.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, Azul Systems, Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@ -36,6 +36,7 @@ import java.util.Optional;
import java.util.StringTokenizer;
import jdk.internal.access.SharedSecrets;
import jdk.internal.loader.NativeLibrary;
import jdk.internal.reflect.CallerSensitive;
import jdk.internal.reflect.Reflection;
@ -738,11 +739,12 @@ public class Runtime {
if (security != null) {
security.checkLink(filename);
}
if (!(new File(filename).isAbsolute())) {
File file = new File(filename);
if (!file.isAbsolute()) {
throw new UnsatisfiedLinkError(
"Expecting an absolute path of the library: " + filename);
}
ClassLoader.loadLibrary(fromClass, filename, true);
ClassLoader.loadLibrary(fromClass, file);
}
/**
@ -804,7 +806,7 @@ public class Runtime {
throw new UnsatisfiedLinkError(
"Directory separator should not appear in library name: " + libname);
}
ClassLoader.loadLibrary(fromClass, libname, false);
ClassLoader.loadLibrary(fromClass, libname);
}
/**