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

Merge branch 'master' into suspend_feature

Browse Source 
Conflicts:
	transport/src/main/java/io/netty/channel/DefaultChannelHandlerContext.java
This commit is contained in:
norman 2012-08-01 09:03:33 +02:00
commit 6a15f7f5ce
28 changed files with 379 additions and 2913 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec-http/src/main/java/io/netty/handler/codec/http/Cookie.java
View File

@ -87,7 +87,7 @@ public interface Cookie extends Comparable<Cookie> {
void setComment(String comment);
/**
* Returns the maximum age of this {@link Cookie} in seconds.
* Returns the maximum age of this {@link Cookie} in seconds or {@link Long#MIN_VALUE} if unspecified
*
* @return The maximum age of this {@link Cookie}
*/
@ -97,7 +97,7 @@ public interface Cookie extends Comparable<Cookie> {
* Sets the maximum age of this {@link Cookie} in seconds.
* If an age of {@code 0} is specified, this {@link Cookie} will be
* automatically removed by browser because it will expire immediately.
* If {@code -1} is specified, this {@link Cookie} will be removed when the
* If {@link Long#MIN_VALUE} is specified, this {@link Cookie} will be removed when the
* browser is closed.
*
* @param maxAge The maximum age of this {@link Cookie} in seconds

2
codec-http/src/main/java/io/netty/handler/codec/http/DefaultCookie.java
View File

@ -35,7 +35,7 @@ public class DefaultCookie implements Cookie {
private boolean discard;
private Set<Integer> ports = Collections.emptySet();
private Set<Integer> unmodifiablePorts = ports;
private long maxAge = -1;
private long maxAge = Long.MIN_VALUE;
private int version;
private boolean secure;
private boolean httpOnly;

2
codec-http/src/main/java/io/netty/handler/codec/http/ServerCookieEncoder.java
View File

@ -54,7 +54,7 @@ public final class ServerCookieEncoder {
add(buf, cookie.getName(), cookie.getValue());
if (cookie.getMaxAge() >= 0) {
if (cookie.getMaxAge() != Long.MIN_VALUE) {
if (cookie.getVersion() == 0) {
addUnquoted(buf, CookieHeaderNames.EXPIRES,
new HttpHeaderDateFormat().format(

7
codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySession.java
View File

@ -15,14 +15,13 @@
*/
package io.netty.handler.codec.spdy;
import io.netty.util.internal.QueueFactory;
import java.util.Comparator;
import java.util.Map;
import java.util.Queue;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicInteger;
final class SpdySession {
@ -177,7 +176,7 @@ final class SpdySession {
private final AtomicInteger sendWindowSize;
private final AtomicInteger receiveWindowSize;
private volatile int receiveWindowSizeLowerBound;
private final BlockingQueue<Object> pendingWriteQueue = QueueFactory.createQueue();
private final Queue<Object> pendingWriteQueue = new ConcurrentLinkedQueue<Object>();
StreamState(
byte priority, boolean remoteSideClosed, boolean localSideClosed,

8
common/src/main/java/io/netty/logging/AbstractInternalLogger.java
View File

@ -31,6 +31,8 @@ public abstract class AbstractInternalLogger implements InternalLogger {
@Override
public boolean isEnabled(InternalLogLevel level) {
switch (level) {
case TRACE:
return isTraceEnabled();
case DEBUG:
return isDebugEnabled();
case INFO:
@ -47,6 +49,9 @@ public abstract class AbstractInternalLogger implements InternalLogger {
@Override
public void log(InternalLogLevel level, String msg, Throwable cause) {
switch (level) {
case TRACE:
trace(msg, cause);
break;
case DEBUG:
debug(msg, cause);
break;
@ -67,6 +72,9 @@ public abstract class AbstractInternalLogger implements InternalLogger {
@Override
public void log(InternalLogLevel level, String msg) {
switch (level) {
case TRACE:
trace(msg);
break;
case DEBUG:
debug(msg);
break;

15
common/src/main/java/io/netty/logging/CommonsLogger.java
View File

@ -31,6 +31,16 @@ class CommonsLogger extends AbstractInternalLogger {
this.loggerName = loggerName;
}
@Override
public void trace(String msg) {
logger.trace(msg);
}
@Override
public void trace(String msg, Throwable cause) {
logger.trace(msg, cause);
}
@Override
public void debug(String msg) {
logger.debug(msg);
@ -61,6 +71,11 @@ class CommonsLogger extends AbstractInternalLogger {
logger.info(msg, cause);
}
@Override
public boolean isTraceEnabled() {
return logger.isTraceEnabled();
}
@Override
public boolean isDebugEnabled() {
return logger.isDebugEnabled();

4
common/src/main/java/io/netty/logging/InternalLogLevel.java
View File

@ -19,6 +19,10 @@ package io.netty.logging;
* The log level that {@link InternalLogger} can log at.
*/
public enum InternalLogLevel {
/**
* 'TRACE' log level.
*/
TRACE,
/**
* 'DEBUG' log level.
*/

15
common/src/main/java/io/netty/logging/InternalLogger.java
View File

@ -20,6 +20,11 @@ package io.netty.logging;
* access this class outside of Netty.
*/
public interface InternalLogger {
/**
* Returns {@code true} if a TRACE level message is logged.
*/
boolean isTraceEnabled();
/**
* Returns {@code true} if a DEBUG level message is logged.
*/
@ -45,6 +50,16 @@ public interface InternalLogger {
*/
boolean isEnabled(InternalLogLevel level);
/**
* Logs a TRACE level message.
*/
void trace(String msg);
/**
* Logs a TRACE level message.
*/
void trace(String msg, Throwable cause);
/**
* Logs a DEBUG level message.
*/

15
common/src/main/java/io/netty/logging/InternalLoggerFactory.java
View File

@ -66,6 +66,16 @@ public abstract class InternalLoggerFactory {
final InternalLogger logger = getDefaultFactory().newInstance(name);
return new InternalLogger() {
@Override
public void trace(String msg) {
logger.trace(msg);
}
@Override
public void trace(String msg, Throwable cause) {
logger.trace(msg, cause);
}
@Override
public void debug(String msg) {
logger.debug(msg);
@ -96,6 +106,11 @@ public abstract class InternalLoggerFactory {
logger.info(msg, cause);
}
@Override
public boolean isTraceEnabled() {
return logger.isTraceEnabled();
}
@Override
public boolean isDebugEnabled() {
return logger.isDebugEnabled();

15
common/src/main/java/io/netty/logging/JBossLogger.java
View File

@ -29,6 +29,16 @@ class JBossLogger extends AbstractInternalLogger {
this.logger = logger;
}
@Override
public void trace(String msg) {
logger.trace(msg);
}
@Override
public void trace(String msg, Throwable cause) {
logger.trace(msg, cause);
}
@Override
public void debug(String msg) {
logger.debug(msg);
@ -59,6 +69,11 @@ class JBossLogger extends AbstractInternalLogger {
logger.info(msg, cause);
}
@Override
public boolean isTraceEnabled() {
return logger.isTraceEnabled();
}
@Override
@SuppressWarnings("deprecation")
public boolean isDebugEnabled() {

15
common/src/main/java/io/netty/logging/JdkLogger.java
View File

@ -32,6 +32,16 @@ class JdkLogger extends AbstractInternalLogger {
this.loggerName = loggerName;
}
@Override
public void trace(String msg) {
logger.logp(Level.FINEST, loggerName, null, msg);
}
@Override
public void trace(String msg, Throwable cause) {
logger.logp(Level.FINEST, loggerName, null, msg, cause);
}
@Override
public void debug(String msg) {
logger.logp(Level.FINE, loggerName, null, msg);
@ -62,6 +72,11 @@ class JdkLogger extends AbstractInternalLogger {
logger.logp(Level.INFO, loggerName, null, msg, cause);
}
@Override
public boolean isTraceEnabled() {
return logger.isLoggable(Level.FINEST);
}
@Override
public boolean isDebugEnabled() {
return logger.isLoggable(Level.FINE);

15
common/src/main/java/io/netty/logging/Log4JLogger.java
View File

@ -29,6 +29,16 @@ class Log4JLogger extends AbstractInternalLogger {
this.logger = logger;
}
@Override
public void trace(String msg) {
logger.trace(msg);
}
@Override
public void trace(String msg, Throwable cause) {
logger.trace(msg, cause);
}
@Override
public void debug(String msg) {
logger.debug(msg);
@ -59,6 +69,11 @@ class Log4JLogger extends AbstractInternalLogger {
logger.info(msg, cause);
}
@Override
public boolean isTraceEnabled() {
return logger.isTraceEnabled();
}
@Override
public boolean isDebugEnabled() {
return logger.isDebugEnabled();

15
common/src/main/java/io/netty/logging/OsgiLogger.java
View File

@ -34,6 +34,16 @@ class OsgiLogger extends AbstractInternalLogger {
prefix = "[" + name + "] ";
}
@Override
public void trace(String msg) {
// This logger doesn't have TRACE level
}
@Override
public void trace(String msg, Throwable cause) {
// This logger doesn't have TRACE level
}
@Override
public void debug(String msg) {
LogService logService = parent.getLogService();
@ -94,6 +104,11 @@ class OsgiLogger extends AbstractInternalLogger {
}
}
@Override
public boolean isTraceEnabled() {
return false;
}
@Override
public boolean isDebugEnabled() {
return true;

15
common/src/main/java/io/netty/logging/Slf4JLogger.java
View File

@ -28,6 +28,16 @@ class Slf4JLogger extends AbstractInternalLogger {
this.logger = logger;
}
@Override
public void trace(String msg) {
logger.trace(msg);
}
@Override
public void trace(String msg, Throwable cause) {
logger.trace(msg, cause);
}
@Override
public void debug(String msg) {
logger.debug(msg);
@ -58,6 +68,11 @@ class Slf4JLogger extends AbstractInternalLogger {
logger.info(msg, cause);
}
@Override
public boolean isTraceEnabled() {
return logger.isTraceEnabled();
}
@Override
public boolean isDebugEnabled() {
return logger.isDebugEnabled();

1373
common/src/main/java/io/netty/util/internal/LegacyLinkedTransferQueue.java
View File

File diff suppressed because it is too large Load Diff

1452
common/src/main/java/io/netty/util/internal/LinkedTransferQueue.java
View File

File diff suppressed because it is too large Load Diff

69
common/src/main/java/io/netty/util/internal/QueueFactory.java
View File

@ -1,69 +0,0 @@
/*
* Copyright 2012 The Netty Project
*
* The Netty Project licenses this file to you under the Apache License,
* version 2.0 (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*/
package io.netty.util.internal;
import io.netty.logging.InternalLogger;
import io.netty.logging.InternalLoggerFactory;
import java.util.concurrent.BlockingQueue;
/**
* This factory should be used to create the "optimal" {@link BlockingQueue}
* instance for the running JVM.
*/
public final class QueueFactory {
private static final InternalLogger logger =
InternalLoggerFactory.getInstance(QueueFactory.class);
private static final boolean USE_LTQ;
static {
boolean useLTQ = false;
try {
if (DetectionUtil.hasUnsafe()) {
new LinkedTransferQueue<Object>();
useLTQ = true;
}
logger.debug(
"No access to the Unsafe - using " +
LegacyLinkedTransferQueue.class.getSimpleName() + " instead.");
} catch (Throwable t) {
logger.debug(
"Failed to initialize a " + LinkedTransferQueue.class.getSimpleName() + " - " +
"using " + LegacyLinkedTransferQueue.class.getSimpleName() + " instead.", t);
}
USE_LTQ = useLTQ;
}
/**
* Create a new unbound {@link BlockingQueue}
*
* @return queue the {@link BlockingQueue} implementation
*/
public static <T> BlockingQueue<T> createQueue() {
if (USE_LTQ) {
return new LinkedTransferQueue<T>();
} else {
return new LegacyLinkedTransferQueue<T>();
}
}
private QueueFactory() {
// only use static methods!
}
}

39
common/src/test/java/io/netty/logging/CommonsLoggerTest.java
View File

@ -23,6 +23,19 @@ import org.junit.Test;
public class CommonsLoggerTest {
private static final Exception e = new Exception();
@Test
public void testIsTraceEnabled() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
expect(mock.isTraceEnabled()).andReturn(true);
replay(mock);
InternalLogger logger = new CommonsLogger(mock, "foo");
assertTrue(logger.isTraceEnabled());
verify(mock);
}
@Test
public void testIsDebugEnabled() {
org.apache.commons.logging.Log mock =
@ -75,6 +88,32 @@ public class CommonsLoggerTest {
verify(mock);
}
@Test
public void testTrace() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
mock.trace("a");
replay(mock);
InternalLogger logger = new CommonsLogger(mock, "foo");
logger.trace("a");
verify(mock);
}
@Test
public void testTraceWithException() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
mock.trace("a", e);
replay(mock);
InternalLogger logger = new CommonsLogger(mock, "foo");
logger.trace("a", e);
verify(mock);
}
@Test
public void testDebug() {
org.apache.commons.logging.Log mock =

30
common/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java
View File

@ -54,6 +54,16 @@ public class InternalLoggerFactoryTest {
assertNotSame(mock, InternalLoggerFactory.getInstance("mock"));
}
@Test
public void testIsTraceEnabled() {
expect(mock.isTraceEnabled()).andReturn(true);
replay(mock);
InternalLogger logger = InternalLoggerFactory.getInstance("mock");
assertTrue(logger.isTraceEnabled());
verify(mock);
}
@Test
public void testIsDebugEnabled() {
expect(mock.isDebugEnabled()).andReturn(true);
@ -94,6 +104,26 @@ public class InternalLoggerFactoryTest {
verify(mock);
}
@Test
public void testTrace() {
mock.trace("a");
replay(mock);
InternalLogger logger = InternalLoggerFactory.getInstance("mock");
logger.trace("a");
verify(mock);
}
@Test
public void testTraceWithException() {
mock.trace("a", e);
replay(mock);
InternalLogger logger = InternalLoggerFactory.getInstance("mock");
logger.trace("a", e);
verify(mock);
}
@Test
public void testDebug() {
mock.debug("a");

39
common/src/test/java/io/netty/logging/JBossLoggerTest.java
View File

@ -23,6 +23,19 @@ import org.junit.Test;
public class JBossLoggerTest {
private static final Exception e = new Exception();
@Test
public void testIsTraceEnabled() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
expect(mock.isTraceEnabled()).andReturn(true);
replay(mock);
InternalLogger logger = new JBossLogger(mock);
assertTrue(logger.isTraceEnabled());
verify(mock);
}
@Test
@SuppressWarnings("deprecation")
public void testIsDebugEnabled() {
@ -73,6 +86,32 @@ public class JBossLoggerTest {
verify(mock);
}
@Test
public void testTrace() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
mock.trace("a");
replay(mock);
InternalLogger logger = new JBossLogger(mock);
logger.trace("a");
verify(mock);
}
@Test
public void testTraceWithException() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
mock.trace("a", e);
replay(mock);
InternalLogger logger = new JBossLogger(mock);
logger.trace("a", e);
verify(mock);
}
@Test
public void testDebug() {
org.jboss.logging.Logger mock =

40
common/src/test/java/io/netty/logging/JdkLoggerTest.java
View File

@ -25,6 +25,20 @@ import org.junit.Test;
public class JdkLoggerTest {
private static final Exception e = new Exception();
@Test
public void testIsTraceEnabled() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
expect(mock.isLoggable(Level.FINEST)).andReturn(true);
replay(mock);
InternalLogger logger = new JdkLogger(mock, "foo");
assertTrue(logger.isTraceEnabled());
verify(mock);
}
@Test
public void testIsDebugEnabled() {
@ -78,6 +92,32 @@ public class JdkLoggerTest {
verify(mock);
}
@Test
public void testTrace() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
mock.logp(Level.FINEST, "foo", null, "a");
replay(mock);
InternalLogger logger = new JdkLogger(mock, "foo");
logger.trace("a");
verify(mock);
}
@Test
public void testTraceWithException() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
mock.logp(Level.FINEST, "foo", null, "a", e);
replay(mock);
InternalLogger logger = new JdkLogger(mock, "foo");
logger.trace("a", e);
verify(mock);
}
@Test
public void testDebug() {
java.util.logging.Logger mock =

40
common/src/test/java/io/netty/logging/Log4JLoggerTest.java
View File

@ -23,6 +23,20 @@ import org.junit.Test;
public class Log4JLoggerTest {
private static final Exception e = new Exception();
@Test
public void testIsTraceEnabled() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
expect(mock.isTraceEnabled()).andReturn(true);
replay(mock);
InternalLogger logger = new Log4JLogger(mock);
assertTrue(logger.isTraceEnabled());
verify(mock);
}
@Test
public void testIsDebugEnabled() {
@ -73,6 +87,32 @@ public class Log4JLoggerTest {
verify(mock);
}
@Test
public void testTrace() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
mock.trace("a");
replay(mock);
InternalLogger logger = new Log4JLogger(mock);
logger.trace("a");
verify(mock);
}
@Test
public void testTraceWithException() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
mock.trace("a", e);
replay(mock);
InternalLogger logger = new Log4JLogger(mock);
logger.trace("a", e);
verify(mock);
}
@Test
public void testDebug() {
org.apache.log4j.Logger mock =

39
common/src/test/java/io/netty/logging/Slf4JLoggerTest.java
View File

@ -23,6 +23,19 @@ import org.junit.Test;
public class Slf4JLoggerTest {
private static final Exception e = new Exception();
@Test
public void testIsTraceEnabled() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
expect(mock.isTraceEnabled()).andReturn(true);
replay(mock);
InternalLogger logger = new Slf4JLogger(mock);
assertTrue(logger.isTraceEnabled());
verify(mock);
}
@Test
public void testIsDebugEnabled() {
org.slf4j.Logger mock =
@ -75,6 +88,32 @@ public class Slf4JLoggerTest {
verify(mock);
}
@Test
public void testTrace() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
mock.trace("a");
replay(mock);
InternalLogger logger = new Slf4JLogger(mock);
logger.trace("a");
verify(mock);
}
@Test
public void testTraceWithException() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
mock.trace("a", e);
replay(mock);
InternalLogger logger = new Slf4JLogger(mock);
logger.trace("a", e);
verify(mock);
}
@Test
public void testDebug() {
org.slf4j.Logger mock =

1
handler/src/main/java/io/netty/handler/logging/LogLevel.java
View File

@ -18,6 +18,7 @@ package io.netty.handler.logging;
import io.netty.logging.InternalLogLevel;
public enum LogLevel {
TRACE(InternalLogLevel.TRACE),
DEBUG(InternalLogLevel.DEBUG),
INFO(InternalLogLevel.INFO),
WARN(InternalLogLevel.WARN),

9
transport/src/main/java/io/netty/channel/DefaultChannelHandlerContext.java
View File

@ -21,13 +21,14 @@ import io.netty.buffer.ChannelBuf;
import io.netty.buffer.MessageBuf;
import io.netty.buffer.Unpooled;
import io.netty.util.DefaultAttributeMap;
import io.netty.util.internal.QueueFactory;
import java.net.SocketAddress;
import java.util.Collections;
import java.util.EnumSet;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
@ -749,7 +750,7 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
static final class MessageBridge {
final MessageBuf<Object> msgBuf = Unpooled.messageBuffer();
final BlockingQueue<Object[]> exchangeBuf = QueueFactory.createQueue();
final Queue<Object[]> exchangeBuf = new ConcurrentLinkedQueue<Object[]>();
void fill() {
if (msgBuf.isEmpty()) {
@ -774,7 +775,7 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
static final class ByteBridge {
final ByteBuf byteBuf = Unpooled.buffer();
final BlockingQueue<ByteBuf> exchangeBuf = QueueFactory.createQueue();
final Queue<ByteBuf> exchangeBuf = new ConcurrentLinkedQueue<ByteBuf>();
void fill() {
if (!byteBuf.readable()) {

4
transport/src/main/java/io/netty/channel/SingleThreadEventExecutor.java
View File

@ -17,7 +17,6 @@ package io.netty.channel;
import io.netty.logging.InternalLogger;
import io.netty.logging.InternalLoggerFactory;
import io.netty.util.internal.QueueFactory;
import java.util.ArrayList;
import java.util.Collections;
@ -32,6 +31,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.DelayQueue;
import java.util.concurrent.Delayed;
import java.util.concurrent.FutureTask;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.Semaphore;
@ -71,7 +71,7 @@ public abstract class SingleThreadEventExecutor extends AbstractExecutorService
}
};
private final BlockingQueue<Runnable> taskQueue = QueueFactory.createQueue();
private final BlockingQueue<Runnable> taskQueue = new LinkedBlockingQueue<Runnable>();
private final Thread thread;
private final Object stateLock = new Object();
private final Semaphore threadLock = new Semaphore(0);

4
transport/src/main/java/io/netty/channel/socket/oio/OioEventLoop.java
View File

@ -22,7 +22,6 @@ import io.netty.channel.ChannelFuture;
import io.netty.channel.EventExecutor;
import io.netty.channel.EventLoop;
import io.netty.channel.SingleThreadEventExecutor;
import io.netty.util.internal.QueueFactory;
import java.util.Collection;
import java.util.Collections;
@ -31,6 +30,7 @@ import java.util.Queue;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
@ -45,7 +45,7 @@ public class OioEventLoop implements EventLoop {
final ThreadFactory threadFactory;
final Set<OioChildEventLoop> activeChildren = Collections.newSetFromMap(
new ConcurrentHashMap<OioChildEventLoop, Boolean>());
final Queue<OioChildEventLoop> idleChildren = QueueFactory.createQueue();
final Queue<OioChildEventLoop> idleChildren = new ConcurrentLinkedQueue<OioChildEventLoop>();
private final ChannelException tooManyChannels;
private final Unsafe unsafe = new Unsafe() {
@Override

6
transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest.java
View File

@ -32,11 +32,11 @@ import io.netty.channel.ChannelOutboundMessageHandler;
import io.netty.channel.DefaultEventExecutor;
import io.netty.channel.EventExecutor;
import io.netty.channel.EventLoop;
import io.netty.util.internal.QueueFactory;
import java.util.HashSet;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
@ -337,8 +337,8 @@ public class LocalTransportThreadModelTest {
private final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
private final Queue<String> inboundThreadNames = QueueFactory.createQueue();
private final Queue<String> outboundThreadNames = QueueFactory.createQueue();
private final Queue<String> inboundThreadNames = new ConcurrentLinkedQueue<String>();
private final Queue<String> outboundThreadNames = new ConcurrentLinkedQueue<String>();
@Override
public MessageBuf<Object> newInboundBuffer(ChannelHandlerContext ctx) throws Exception {