Author: trustin
Date: Mon Nov 5 01:36:01 2007
New Revision: 591933
URL: http://svn.apache.org/viewvc?rev=591933&view=rev
Log:
Replaced plain use of LinkedList with CircularQueue
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolDecoderOutput.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolEncoderOutput.java
mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
mina/trunk/core/src/main/java/org/apache/mina/filter/stream/StreamWriteFilter.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolDecoderOutput.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolDecoderOutput.java?rev=591933&r1=591932&r2=591933&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolDecoderOutput.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolDecoderOutput.java
Mon Nov 5 01:36:01 2007
@@ -19,9 +19,10 @@
*/
package org.apache.mina.filter.codec;
-import java.util.LinkedList;
import java.util.Queue;
+import org.apache.mina.util.CircularQueue;
+
/**
* A [EMAIL PROTECTED] ProtocolDecoderOutput} based on queue.
*
@@ -29,7 +30,7 @@
* @version $Rev$, $Date$
*/
public abstract class AbstractProtocolDecoderOutput implements
ProtocolDecoderOutput {
- private final Queue<Object> messageQueue = new LinkedList<Object>();
+ private final Queue<Object> messageQueue = new CircularQueue<Object>();
public AbstractProtocolDecoderOutput() {
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolEncoderOutput.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolEncoderOutput.java?rev=591933&r1=591932&r2=591933&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolEncoderOutput.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolEncoderOutput.java
Mon Nov 5 01:36:01 2007
@@ -19,10 +19,10 @@
*/
package org.apache.mina.filter.codec;
-import java.util.LinkedList;
import java.util.Queue;
import org.apache.mina.common.IoBuffer;
+import org.apache.mina.util.CircularQueue;
/**
* A [EMAIL PROTECTED] ProtocolEncoderOutput} based on queue.
@@ -32,7 +32,7 @@
*/
public abstract class AbstractProtocolEncoderOutput implements
ProtocolEncoderOutput {
- private final Queue<IoBuffer> bufferQueue = new LinkedList<IoBuffer>();
+ private final Queue<IoBuffer> bufferQueue = new CircularQueue<IoBuffer>();
public AbstractProtocolEncoderOutput() {
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java?rev=591933&r1=591932&r2=591933&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java
Mon Nov 5 01:36:01 2007
@@ -19,7 +19,6 @@
*/
package org.apache.mina.filter.executor;
-import java.util.LinkedList;
import java.util.Queue;
import java.util.concurrent.Executor;
@@ -28,6 +27,7 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoFilterEvent;
import org.apache.mina.common.IoSession;
+import org.apache.mina.util.CircularQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -128,7 +128,7 @@
private static class SessionBuffer {
private final IoSession session;
- private final Queue<IoFilterEvent> eventQueue = new
LinkedList<IoFilterEvent>();
+ private final Queue<IoFilterEvent> eventQueue = new
CircularQueue<IoFilterEvent>();
private boolean processingCompleted = true;
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java?rev=591933&r1=591932&r2=591933&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
Mon Nov 5 01:36:01 2007
@@ -21,7 +21,6 @@
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
-import java.util.LinkedList;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -42,6 +41,7 @@
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
+import org.apache.mina.util.CircularQueue;
import org.slf4j.Logger;
/**
@@ -64,7 +64,7 @@
private final IoSession session;
- private final Queue<IoFilterEvent> preHandshakeEventQueue = new
LinkedList<IoFilterEvent>();
+ private final Queue<IoFilterEvent> preHandshakeEventQueue = new
CircularQueue<IoFilterEvent>();
private final Queue<IoFilterEvent> filterWriteEventQueue = new
ConcurrentLinkedQueue<IoFilterEvent>();
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/stream/StreamWriteFilter.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/stream/StreamWriteFilter.java?rev=591933&r1=591932&r2=591933&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/stream/StreamWriteFilter.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/stream/StreamWriteFilter.java
Mon Nov 5 01:36:01 2007
@@ -21,7 +21,6 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.LinkedList;
import java.util.Queue;
import org.apache.mina.common.AttributeKey;
@@ -32,6 +31,7 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.WriteRequest;
+import org.apache.mina.util.CircularQueue;
/**
* Filter implementation which makes it possible to write [EMAIL PROTECTED]
InputStream}
@@ -90,7 +90,7 @@
if (session.getAttribute(CURRENT_STREAM) != null) {
Queue<WriteRequest> queue = getWriteRequestQueue(session);
if (queue == null) {
- queue = new LinkedList<WriteRequest>();
+ queue = new CircularQueue<WriteRequest>();
session.setAttribute(WRITE_REQUEST_QUEUE, queue);
}
queue.add(writeRequest);
