From a75ac747f06483060070b2a303bf8917a6d7847c Mon Sep 17 00:00:00 2001 From: Scott Mitchell Date: Thu, 3 Aug 2017 22:35:54 -0700 Subject: [PATCH] Remove io.netty.packagePrefix system property Motivation: Now that the NativeLibraryLoader implicitly detects the shaded package prefix we no longer need the io.netty.packagePrefix system property. Modifications: - Remove io.netty.packagePrefix processing from NativeLibraryLoader Result: Code is cleaner. --- .../java/io/netty/util/internal/NativeLibraryLoader.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/common/src/main/java/io/netty/util/internal/NativeLibraryLoader.java b/common/src/main/java/io/netty/util/internal/NativeLibraryLoader.java index 08836d09bd..da8054a560 100644 --- a/common/src/main/java/io/netty/util/internal/NativeLibraryLoader.java +++ b/common/src/main/java/io/netty/util/internal/NativeLibraryLoader.java @@ -202,10 +202,7 @@ public final class NativeLibraryLoader { */ public static void load(String originalName, ClassLoader loader) { // Adjust expected name to support shading of native libraries. - String implicitPackagePrefix = calculatePackagePrefix(); - // The system property should not be necessary; it can be removed in the future. - String packagePrefix = SystemPropertyUtil.get("io.netty.packagePrefix", implicitPackagePrefix); - String name = packagePrefix.replace('.', '-') + originalName; + String name = calculatePackagePrefix().replace('.', '-') + originalName; String libname = System.mapLibraryName(name); String path = NATIVE_RESOURCE_HOME + libname;