Skip to content

Commit

Permalink
OpenSsl should use _ instead of -
Browse files Browse the repository at this point in the history
Motivation:
netty-tcnative recently change the name of the native libraries from using - to _.

Modifications:
- OpenSsl should use _ instead of - even for the classifiers to be consistent with netty-tcnative

Result:
Loading netty-tcnative works.
  • Loading branch information
Scottmitch committed Aug 24, 2017
1 parent 6e85946 commit c93e58c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions handler/src/main/java/io/netty/handler/ssl/OpenSsl.java
Original file line number Diff line number Diff line change
Expand Up @@ -410,10 +410,10 @@ private static void loadTcNative() throws Exception {
Set<String> libNames = new LinkedHashSet<String>(4);
// First, try loading the platform-specific library. Platform-specific
// libraries will be available if using a tcnative uber jar.
libNames.add("netty_tcnative-" + os + '-' + arch);
libNames.add("netty_tcnative_" + os + '_' + arch);
if (LINUX.equalsIgnoreCase(os)) {
// Fedora SSL lib so naming (libssl.so.10 vs libssl.so.1.0.0)..
libNames.add("netty_tcnative-" + os + '-' + arch + "-fedora");
libNames.add("netty_tcnative_" + os + '_' + arch + "_fedora");
}
// finally the default library.
libNames.add("netty_tcnative");
Expand Down

0 comments on commit c93e58c

Please sign in to comment.