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

Fix compile errors introduced by bad cherry-picks (#10391)

Browse Source
This commit is contained in:
Norman Maurer 2020-07-06 13:22:31 +02:00 committed by GitHub
parent 9955ef563e
commit f8b3a388ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec-http/src/test/java/io/netty/handler/codec/http/multipart/DiskFileUploadTest.java
View File

@ -197,7 +197,7 @@ public class DiskFileUploadTest {
DiskFileUpload f1 = new DiskFileUpload("file3", "file3", "application/json", null, null, 0); DiskFileUpload f1 = new DiskFileUpload("file3", "file3", "application/json", null, null, 0);
try { try {
byte[] bytes = new byte[4096]; byte[] bytes = new byte[4096];
PlatformDependent.threadLocalRandom().nextBytes(bytes); ThreadLocalRandom.current().nextBytes(bytes);
final ByteBuf buffer; final ByteBuf buffer;

1
common/src/main/java/io/netty/util/ResourceLeakDetectorFactory.java
View File

@ -18,6 +18,7 @@ package io.netty.util;
import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNull;
import io.netty.util.internal.ObjectUtil;
import io.netty.util.internal.PlatformDependent; import io.netty.util.internal.PlatformDependent;
import io.netty.util.internal.SystemPropertyUtil; import io.netty.util.internal.SystemPropertyUtil;
import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLogger;