andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix native library loading in Windows

Browse Source 
Motivation:

Windows refuses to load a .DLL file when it's opened by other process.
Recent modification in NativeLibraryLoader causes NativeLibraryLoader to
attempt to load a .DLL before closing its OutputStream. As a result,
loading a .DLL file in Windows always fails.

Modifications:

Close the OutputStream explicitly before loading a shared library.

Result:

Native library loading in Windows works again.
This commit is contained in:
Trustin Lee 2016-08-31 09:01:37 +09:00 committed by Norman Maurer
parent fdd5fed6f1
commit b6bd178cb1
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/io/netty/util/internal/NativeLibraryLoader.java
View File

@ -213,6 +213,11 @@ public final class NativeLibraryLoader {
} }
out.flush(); out.flush();
// Close the output stream before loading the unpacked library,
// because otherwise Windows will refuse to load it when it's in use by other process.
closeQuietly(out);
out = null;
loadLibrary(loader, tmpFile.getPath(), true); loadLibrary(loader, tmpFile.getPath(), true);
} catch (Exception e) { } catch (Exception e) {
throw (UnsatisfiedLinkError) new UnsatisfiedLinkError( throw (UnsatisfiedLinkError) new UnsatisfiedLinkError(