From f8b3a388ff8cafedea32973d6a355eebedca0020 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Mon, 6 Jul 2020 13:22:31 +0200 Subject: [PATCH] Fix compile errors introduced by bad cherry-picks (#10391) --- .../netty/handler/codec/http/multipart/DiskFileUploadTest.java | 2 +- .../main/java/io/netty/util/ResourceLeakDetectorFactory.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/multipart/DiskFileUploadTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/multipart/DiskFileUploadTest.java index b04ec5862e..7ea9740c3b 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/multipart/DiskFileUploadTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/multipart/DiskFileUploadTest.java @@ -197,7 +197,7 @@ public class DiskFileUploadTest { DiskFileUpload f1 = new DiskFileUpload("file3", "file3", "application/json", null, null, 0); try { byte[] bytes = new byte[4096]; - PlatformDependent.threadLocalRandom().nextBytes(bytes); + ThreadLocalRandom.current().nextBytes(bytes); final ByteBuf buffer; diff --git a/common/src/main/java/io/netty/util/ResourceLeakDetectorFactory.java b/common/src/main/java/io/netty/util/ResourceLeakDetectorFactory.java index 172de09be5..a5e97918ae 100644 --- a/common/src/main/java/io/netty/util/ResourceLeakDetectorFactory.java +++ b/common/src/main/java/io/netty/util/ResourceLeakDetectorFactory.java @@ -18,6 +18,7 @@ package io.netty.util; import static java.util.Objects.requireNonNull; +import io.netty.util.internal.ObjectUtil; import io.netty.util.internal.PlatformDependent; import io.netty.util.internal.SystemPropertyUtil; import io.netty.util.internal.logging.InternalLogger;