From dd2440cbadc642a561d8f92c502fe822b2f11762 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 5 Feb 2015 00:19:22 +0100 Subject: Refine commit 12feaa7d3b1544098f684d851e3caff1ec88cbc8: Add 'throws SecurityException' decl., remove dead code, remove redundant check. --- .../com/jogamp/common/os/DynamicLibraryBundle.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/java/com/jogamp/common/os') diff --git a/src/java/com/jogamp/common/os/DynamicLibraryBundle.java b/src/java/com/jogamp/common/os/DynamicLibraryBundle.java index 06cef6f..c578565 100644 --- a/src/java/com/jogamp/common/os/DynamicLibraryBundle.java +++ b/src/java/com/jogamp/common/os/DynamicLibraryBundle.java @@ -231,7 +231,7 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { public final DynamicLibraryBundleInfo getBundleInfo() { return info; } - protected final long getToolGetProcAddressHandle() { + protected final long getToolGetProcAddressHandle() throws SecurityException { if(!isToolLibLoaded()) { return 0; } @@ -246,7 +246,7 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { return aptr; } - protected static final NativeLibrary loadFirstAvailable(final List libNames, final ClassLoader loader, final boolean global) { + protected static final NativeLibrary loadFirstAvailable(final List libNames, final ClassLoader loader, final boolean global) throws SecurityException { for (int i=0; i < libNames.size(); i++) { final NativeLibrary lib = NativeLibrary.open(libNames.get(i), loader, global); if (lib != null) { @@ -256,7 +256,7 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { return null; } - final DynamicLinker loadLibraries() { + final DynamicLinker loadLibraries() throws SecurityException { int i; toolLibLoadedNumber = 0; final ClassLoader cl = info.getClass().getClassLoader(); @@ -317,7 +317,12 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { return dynLinkGlobal; } - private final long dynamicLookupFunctionOnLibs(final String funcName) { + /** + * @param funcName + * @return + * @throws SecurityException if user is not granted access for the library set. + */ + private final long dynamicLookupFunctionOnLibs(final String funcName) throws SecurityException { if(!isToolLibLoaded() || null==funcName) { if(DEBUG_LOOKUP && !isToolLibLoaded()) { System.err.println("Lookup-Native: <" + funcName + "> ** FAILED ** Tool native library not loaded"); @@ -364,7 +369,6 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { @Override public final void claimAllLinkPermission() throws SecurityException { for (int i=0; i < nativeLibraries.size(); i++) { - final NativeLibrary lib = nativeLibraries.get(i); nativeLibraries.get(i).claimAllLinkPermission(); } } @@ -376,7 +380,7 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { } @Override - public final long dynamicLookupFunction(final String funcName) { + public final long dynamicLookupFunction(final String funcName) throws SecurityException { if(!isToolLibLoaded() || null==funcName) { if(DEBUG_LOOKUP && !isToolLibLoaded()) { System.err.println("Lookup: <" + funcName + "> ** FAILED ** Tool native library not loaded"); @@ -404,7 +408,7 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { } @Override - public final boolean isFunctionAvailable(final String funcName) { + public final boolean isFunctionAvailable(final String funcName) throws SecurityException { return 0 != dynamicLookupFunction(funcName); } -- cgit v1.2.3