Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make JNI library not found message clearer (#1495)

Browse Source 
Closes #1472
This commit is contained in:
Thad House
2018-12-21 00:26:53 -08:00
committed by Peter Johnson
parent 0d7d880261
commit ce1367a115
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wpiutil/src/main/java/edu/wpi/first/wpiutil/RuntimeLoader.java
View File

@@ -51,6 +51,16 @@ public final class RuntimeLoader<T> {
m_extractionRoot = extractionRoot;
}
private String getLoadErrorMessage() {
StringBuilder msg = new StringBuilder(256);
msg.append(m_libraryName)
.append(" could not be loaded from path or an embedded resource.\n"
+ "\tattempted to load for platform ")
.append(RuntimeDetector.getPlatformPath())
.append('\n');
return msg.toString();
}
/**
* Loads a native library.
*/
@@ -66,7 +76,7 @@ public final class RuntimeLoader<T> {
String resname = RuntimeDetector.getLibraryResource(m_libraryName);
try (InputStream hashIs = m_loadClass.getResourceAsStream(hashName)) {
if (hashIs == null) {
throw new IOException(hashName + " Resource not found");
throw new IOException(getLoadErrorMessage());
}
try (Scanner scanner = new Scanner(hashIs, StandardCharsets.UTF_8.name())) {
String hash = scanner.nextLine();
@@ -78,7 +88,7 @@ public final class RuntimeLoader<T> {
// If extraction failed, extract
try (InputStream resIs = m_loadClass.getResourceAsStream(resname)) {
if (resIs == null) {
throw new IOException(resname + " Resource not found");
throw new IOException(getLoadErrorMessage());
}
jniLibrary.getParentFile().mkdirs();
try (OutputStream os = Files.newOutputStream(jniLibrary.toPath())) {
@@ -112,7 +122,7 @@ public final class RuntimeLoader<T> {
String hash = null;
try (InputStream is = m_loadClass.getResourceAsStream(resname)) {
if (is == null) {
throw new IOException(resname + " Resource not found");
throw new IOException(getLoadErrorMessage());
}
MessageDigest md = null;
try {
@@ -144,7 +154,7 @@ public final class RuntimeLoader<T> {
// If extraction failed, extract
try (InputStream resIs = m_loadClass.getResourceAsStream(resname)) {
if (resIs == null) {
throw new IOException(resname + " Resource not found");
throw new IOException(getLoadErrorMessage());
}
jniLibrary.getParentFile().mkdirs();
try (OutputStream os = Files.newOutputStream(jniLibrary.toPath())) {