Author: adc
Date: Tue Jul 5 18:52:44 2011
New Revision: 1143166
URL: http://svn.apache.org/viewvc?rev=1143166&view=rev
Log:
Removed WriteQueue
Removed:
mina/branches/3.0/core/src/main/java/org/apache/mina/session/WriteQueue.java
Modified:
mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoSession.java
mina/branches/3.0/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
mina/branches/3.0/core/src/main/java/org/apache/mina/session/DefaultWriteQueue.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
Modified:
mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoSession.java
URL:
http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoSession.java?rev=1143166&r1=1143165&r2=1143166&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoSession.java
(original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoSession.java Tue
Jul 5 18:52:44 2011
@@ -20,10 +20,11 @@
package org.apache.mina.api;
import java.net.SocketAddress;
+import java.util.Queue;
import java.util.Set;
import org.apache.mina.service.SelectorProcessor;
-import org.apache.mina.session.WriteQueue;
+import org.apache.mina.session.WriteRequest;
/**
* A handle which represents a connection between two end-points regardless of
@@ -283,8 +284,8 @@ public interface IoSession {
public IoFuture<Void> writeWithFuture(Object message);
/**
- * Get the {@link WriteQueue} of this session. The write queue contains
the pending writes.
+ * Get the {@link Queue} of this session. The write queue contains the
pending writes.
* @return the write queue of this session
*/
- public WriteQueue getWriteQueue();
+ public Queue<WriteRequest> getWriteQueue();
}
\ No newline at end of file
Modified:
mina/branches/3.0/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
URL:
http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/session/AbstractIoSession.java?rev=1143166&r1=1143165&r2=1143166&view=diff
==============================================================================
---
mina/branches/3.0/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
(original)
+++
mina/branches/3.0/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
Tue Jul 5 18:52:44 2011
@@ -20,6 +20,7 @@
package org.apache.mina.session;
import java.util.Map;
+import java.util.Queue;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -79,7 +80,7 @@ public abstract class AbstractIoSession
AtomicBoolean registeredForWrite = new AtomicBoolean();
/** the queue of pending writes for the session, to be dequeued by the
{@link SelectorProcessor} */
- private WriteQueue writeQueue = new DefaultWriteQueue();
+ private Queue<WriteRequest> writeQueue = new DefaultWriteQueue();
/**
* Create an {@link org.apache.mina.api.IoSession} with a unique
identifier (
@@ -236,7 +237,7 @@ public abstract class AbstractIoSession
}
@Override
- public WriteQueue getWriteQueue() {
+ public Queue<WriteRequest> getWriteQueue() {
return writeQueue;
}
}
\ No newline at end of file
Modified:
mina/branches/3.0/core/src/main/java/org/apache/mina/session/DefaultWriteQueue.java
URL:
http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/session/DefaultWriteQueue.java?rev=1143166&r1=1143165&r2=1143166&view=diff
==============================================================================
---
mina/branches/3.0/core/src/main/java/org/apache/mina/session/DefaultWriteQueue.java
(original)
+++
mina/branches/3.0/core/src/main/java/org/apache/mina/session/DefaultWriteQueue.java
Tue Jul 5 18:52:44 2011
@@ -24,12 +24,11 @@ import java.util.concurrent.ConcurrentLi
/**
* The default implementation of the WriteRequest queue for storing writes to
* process in the {@link org.apache.mina.api.IoSession}.
- *
+ *
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
- *
*/
-public class DefaultWriteQueue extends ConcurrentLinkedQueue<WriteRequest>
implements WriteQueue {
+public class DefaultWriteQueue extends ConcurrentLinkedQueue<WriteRequest> {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
}
Modified:
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
URL:
http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java?rev=1143166&r1=1143165&r2=1143166&view=diff
==============================================================================
---
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
(original)
+++
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
Tue Jul 5 18:52:44 2011
@@ -42,7 +42,6 @@ import org.apache.mina.api.IoSession;
import org.apache.mina.service.AbstractIoService;
import org.apache.mina.service.SelectorProcessor;
import org.apache.mina.service.SelectorStrategy;
-import org.apache.mina.session.WriteQueue;
import org.apache.mina.session.WriteRequest;
import org.apache.mina.transport.tcp.nio.NioTcpServer;
import org.slf4j.Logger;
@@ -289,7 +288,7 @@ public class NioSelectorProcessor implem
LOGGER.debug("writable session : {}",
key.attachment());
NioTcpSession session = (NioTcpSession)
key.attachment();
// write from the session write queue
- WriteQueue queue = session.getWriteQueue();
+ Queue<WriteRequest> queue =
session.getWriteQueue();
do {
// get a write request from the queue
WriteRequest wreq = queue.peek();
