diff options
author | Sven Gothel <[email protected]> | 2015-03-18 00:14:39 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2015-03-18 00:14:39 +0100 |
commit | 030b580cf8bb7f1e91eed6e47a341eb50fc2e6be (patch) | |
tree | 7d273b0b47d5633d7ec86fde645f30ecdbb8b792 | |
parent | bd2019270defbaa1a625e5d097b76beb8610a8ed (diff) |
Fix DynamicLibraryBundle.isToolLibComplete() no tool-lib case, regression of commit 12feaa7d3b1544098f684d851e3caff1ec88cbc8
Regression of commit 12feaa7d3b1544098f684d851e3caff1ec88cbc8
'isToolLibComplete()' returned false if dynLinkGlobal is null,
even if no tool-lib has been used. In which case dynLinkGlobal
has not been initialized and hence is always null.
'isToolLibComplete()' now takes no tool-lib into consideration!
Currently only 'OVRDynamicLibraryBundleInfo' of JOGL's 'oculusvr' binding
used this configuration within JogAmp.
-rw-r--r-- | src/java/com/jogamp/common/os/DynamicLibraryBundle.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/java/com/jogamp/common/os/DynamicLibraryBundle.java b/src/java/com/jogamp/common/os/DynamicLibraryBundle.java index c578565..2f51e2e 100644 --- a/src/java/com/jogamp/common/os/DynamicLibraryBundle.java +++ b/src/java/com/jogamp/common/os/DynamicLibraryBundle.java @@ -189,7 +189,10 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { * @see DynamicLibraryBundleInfo#getToolLibNames() */ public final boolean isToolLibComplete() { - return toolGetProcAddressComplete && null != dynLinkGlobal && getToolLibNumber() == getToolLibLoadedNumber(); + final int toolLibNumber = getToolLibNumber(); + return toolGetProcAddressComplete && + ( 0 == toolLibNumber || null != dynLinkGlobal ) && + toolLibNumber == getToolLibLoadedNumber(); } public final boolean isToolLibLoaded() { |