IGNITE-2235: Replaced ConcurrentLinkedDeque8 with ConcurrentLinkedQueue in GridNioServer.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2613b958 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2613b958 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2613b958 Branch: refs/heads/ignite-gg-10837 Commit: 2613b9581736d8c10eac0ac3250910e76f9600b5 Parents: e298eab Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Dec 29 15:29:19 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Dec 29 15:29:19 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/util/nio/GridNioServer.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2613b958/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java index 17a0b8f..c366fe3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java @@ -41,8 +41,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Queue; import java.util.Set; +import java.util.concurrent.ConcurrentLinkedQueue; + import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; @@ -65,7 +66,6 @@ import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageWriter; import org.apache.ignite.thread.IgniteThread; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentLinkedDeque8; import sun.nio.ch.DirectBuffer; import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.ACK_CLOSURE; @@ -1105,7 +1105,9 @@ public class GridNioServer<T> { */ private void writeSslSystem(GridSelectorNioSessionImpl ses, WritableByteChannel sockCh) throws IOException { - ConcurrentLinkedDeque8<ByteBuffer> queue = ses.meta(BUF_SSL_SYSTEM_META_KEY); + ConcurrentLinkedQueue<ByteBuffer> queue = ses.meta(BUF_SSL_SYSTEM_META_KEY); + + assert queue != null; ByteBuffer buf; @@ -1244,7 +1246,7 @@ public class GridNioServer<T> { */ private abstract class AbstractNioClientWorker extends GridWorker { /** Queue of change requests on this selector. */ - private final Queue<NioOperationFuture> changeReqs = new ConcurrentLinkedDeque8<>(); + private final ConcurrentLinkedQueue<NioOperationFuture> changeReqs = new ConcurrentLinkedQueue<>(); /** Selector to select read events. */ private Selector selector; @@ -2105,7 +2107,7 @@ public class GridNioServer<T> { /** {@inheritDoc} */ @Override public void onSessionOpened(GridNioSession ses) throws IgniteCheckedException { if (directMode && sslFilter != null) - ses.addMeta(BUF_SSL_SYSTEM_META_KEY, new ConcurrentLinkedDeque8<>()); + ses.addMeta(BUF_SSL_SYSTEM_META_KEY, new ConcurrentLinkedQueue<>()); proceedSessionOpened(ses); } @@ -2126,7 +2128,9 @@ public class GridNioServer<T> { boolean sslSys = sslFilter != null && msg instanceof ByteBuffer; if (sslSys) { - ConcurrentLinkedDeque8<ByteBuffer> queue = ses.meta(BUF_SSL_SYSTEM_META_KEY); + ConcurrentLinkedQueue<ByteBuffer> queue = ses.meta(BUF_SSL_SYSTEM_META_KEY); + + assert queue != null; queue.offer((ByteBuffer)msg);