Skip to content

Commit 054df33

Browse files
author
Klaus Rennecke
committed
skip null entries in native library path candidates
1 parent 160d75e commit 054df33

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

src/main/java/org/bridj/BridJ.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,15 @@
3131
package org.bridj;
3232

3333
import org.bridj.ann.Forwardable;
34+
3435
import java.util.Set;
3536
import java.util.HashSet;
37+
3638
import org.bridj.util.Utils;
39+
3740
import static org.bridj.util.AnnotationUtils.*;
3841
import static org.bridj.util.Utils.*;
42+
3943
import java.io.File;
4044
import java.io.FileNotFoundException;
4145
import java.io.IOException;
@@ -59,13 +63,17 @@
5963
import org.bridj.demangling.Demangler.Symbol;
6064
import org.bridj.demangling.Demangler.MemberRef;
6165
import org.bridj.ann.Library;
66+
6267
import java.util.Stack;
6368
import java.io.PrintWriter;
6469
import java.lang.reflect.Type;
6570
import java.net.URL;
71+
6672
import org.bridj.util.StringUtils;
73+
6774
import static org.bridj.Platform.*;
6875
import static java.lang.System.*;
76+
6977
import org.bridj.util.ClassDefiner;
7078
import org.bridj.util.ASMUtils;
7179

@@ -734,9 +742,11 @@ static synchronized List<String> getNativeLibraryPaths() {
734742
nativeLibraryPaths.add("/usr/local/lib");
735743
}
736744
for (Iterator<String> it = nativeLibraryPaths.iterator(); it.hasNext();) {
737-
if (!new File(it.next()).isDirectory()) {
745+
final String next = it.next();
746+
if (null != next && new File(next).isDirectory()) {
747+
continue;
748+
}
738749
it.remove();
739-
}
740750
}
741751
}
742752
return nativeLibraryPaths;

0 commit comments

Comments
 (0)