Pull request #6956: REPORT-81024 websocket连接异常

Merge in CORE/base-third from ~YUAN.WANG/base-third:feature/x to feature/x

* commit '8071467077e86a7ff1f4ee37975fa45e0d5b69e3':
  REPORT-81024 websocket连接异常

fine-netty/src/main/java/io/netty/util/Recycler.java

@@ -21,7 +21,7 @@ import io.netty.util.internal.PlatformDependent;
 import io.netty.util.internal.SystemPropertyUtil;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
-import org.jctools.queues.MessagePassingQueue;
+import io.netty.util.internal.shaded.org.jctools.queues.MessagePassingQueue;
 
 import java.util.ArrayDeque;
 import java.util.Queue;

fine-netty/src/main/java/io/netty/util/internal/PlatformDependent.java

@@ -18,16 +18,16 @@ package io.netty.util.internal;
 import io.netty.util.CharsetUtil;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
-import org.jctools.queues.MpscArrayQueue;
-import org.jctools.queues.MpscChunkedArrayQueue;
-import org.jctools.queues.MpscUnboundedArrayQueue;
-import org.jctools.queues.SpscLinkedQueue;
-import org.jctools.queues.atomic.MpscAtomicArrayQueue;
-import org.jctools.queues.atomic.MpscChunkedAtomicArrayQueue;
-import org.jctools.queues.atomic.MpscUnboundedAtomicArrayQueue;
-import org.jctools.queues.atomic.SpscLinkedAtomicQueue;
-import org.jctools.util.Pow2;
-import org.jctools.util.UnsafeAccess;
+import io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueue;
+import io.netty.util.internal.shaded.org.jctools.queues.MpscChunkedArrayQueue;
+import io.netty.util.internal.shaded.org.jctools.queues.MpscUnboundedArrayQueue;
+import io.netty.util.internal.shaded.org.jctools.queues.SpscLinkedQueue;
+import io.netty.util.internal.shaded.org.jctools.queues.atomic.MpscAtomicArrayQueue;
+import io.netty.util.internal.shaded.org.jctools.queues.atomic.MpscChunkedAtomicArrayQueue;
+import io.netty.util.internal.shaded.org.jctools.queues.atomic.MpscUnboundedAtomicArrayQueue;
+import io.netty.util.internal.shaded.org.jctools.queues.atomic.SpscLinkedAtomicQueue;
+import io.netty.util.internal.shaded.org.jctools.util.Pow2;
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -965,10 +965,10 @@ public final class PlatformDependent {
             }
 
             if (unsafe == null) {
-                logger.debug("org.jctools-core.MpscChunkedArrayQueue: unavailable");
+                logger.debug("io.netty.util.internal.shaded.org.jctools.core.MpscChunkedArrayQueue: unavailable");
                 USE_MPSC_CHUNKED_ARRAY_QUEUE = false;
             } else {
-                logger.debug("org.jctools-core.MpscChunkedArrayQueue: available");
+                logger.debug("io.netty.util.internal.shaded.org.jctools.core.MpscChunkedArrayQueue: available");
                 USE_MPSC_CHUNKED_ARRAY_QUEUE = true;
             }
         }