From 030b580cf8bb7f1e91eed6e47a341eb50fc2e6be Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 18 Mar 2015 00:14:39 +0100
Subject: 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.
---
src/java/com/jogamp/common/os/DynamicLibraryBundle.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'src/java/com')
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() {
--
cgit v1.2.3