Author: trustin
Date: Thu Dec 27 19:46:03 2007
New Revision: 607167
URL: http://svn.apache.org/viewvc?rev=607167&view=rev
Log:
Renamed AbstractProtocolEncoderOutput.encodedMessageQueue to messageQueue to
get aligned with AbstractProtocolDecoderOutput
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolEncoderOutput.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecSession.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoder.java
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=607167&r1=607166&r2=607167&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
Thu Dec 27 19:46:03 2007
@@ -32,27 +32,27 @@
*/
public abstract class AbstractProtocolEncoderOutput implements
ProtocolEncoderOutput {
- private final Queue<Object> encodedMessageQueue = new
CircularQueue<Object>();
+ private final Queue<Object> messageQueue = new CircularQueue<Object>();
private boolean buffersOnly = true;
public AbstractProtocolEncoderOutput() {
}
- public Queue<Object> getEncodedMessageQueue() {
- return encodedMessageQueue;
+ public Queue<Object> getMessageQueue() {
+ return messageQueue;
}
public void write(Object encodedMessage) {
if (encodedMessage instanceof IoBuffer) {
IoBuffer buf = (IoBuffer) encodedMessage;
if (buf.hasRemaining()) {
- encodedMessageQueue.offer(buf);
+ messageQueue.offer(buf);
} else {
throw new IllegalArgumentException(
"buf is empty. Forgot to call flip()?");
}
} else {
- encodedMessageQueue.offer(encodedMessage);
+ messageQueue.offer(encodedMessage);
buffersOnly = false;
}
}
@@ -63,7 +63,7 @@
"the encoded message list contains a non-buffer.");
}
- final int size = encodedMessageQueue.size();
+ final int size = messageQueue.size();
if (size < 2) {
// no need to merge!
@@ -72,7 +72,7 @@
// Get the size of merged BB
int sum = 0;
- for (Object b : encodedMessageQueue) {
+ for (Object b : messageQueue) {
sum += ((IoBuffer) b).remaining();
}
@@ -81,7 +81,7 @@
// and merge all.
for (; ;) {
- IoBuffer buf = (IoBuffer) encodedMessageQueue.poll();
+ IoBuffer buf = (IoBuffer) messageQueue.poll();
if (buf == null) {
break;
}
@@ -91,6 +91,6 @@
// Push the new buffer finally.
newBuf.flip();
- encodedMessageQueue.add(newBuf);
+ messageQueue.add(newBuf);
}
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java?rev=607167&r1=607166&r2=607167&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
Thu Dec 27 19:46:03 2007
@@ -387,7 +387,7 @@
}
public WriteFuture flush() {
- Queue<Object> bufferQueue = getEncodedMessageQueue();
+ Queue<Object> bufferQueue = getMessageQueue();
WriteFuture future = null;
for (;;) {
Object encodedMessage = bufferQueue.poll();
@@ -413,7 +413,7 @@
}
public void flushWithoutFuture() {
- Queue<Object> bufferQueue = getEncodedMessageQueue();
+ Queue<Object> bufferQueue = getMessageQueue();
for (;;) {
Object encodedMessage = bufferQueue.poll();
if (encodedMessage == null) {
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecSession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecSession.java?rev=607167&r1=607166&r2=607167&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecSession.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecSession.java
Thu Dec 27 19:46:03 2007
@@ -93,7 +93,7 @@
* Returns the [EMAIL PROTECTED] Queue} of the buffered encoder output.
*/
public Queue<Object> getEncoderOutputQueue() {
- return encoderOutput.getEncodedMessageQueue();
+ return encoderOutput.getMessageQueue();
}
/**
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoder.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoder.java?rev=607167&r1=607166&r2=607167&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoder.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoder.java
Thu Dec 27 19:46:03 2007
@@ -26,9 +26,8 @@
* Encodes higher-level message objects into binary or protocol-specific data.
* MINA invokes [EMAIL PROTECTED] #encode(IoSession, Object,
ProtocolEncoderOutput)}
* method with message which is popped from the session write queue, and then
- * the encoder implementation puts encoded [EMAIL PROTECTED] IoBuffer}s into
- * [EMAIL PROTECTED] ProtocolEncoderOutput} by calling
- * [EMAIL PROTECTED] ProtocolEncoderOutput#write(IoBuffer)}.
+ * the encoder implementation puts encoded messages (typically [EMAIL
PROTECTED] IoBuffer}s)
+ * into [EMAIL PROTECTED] ProtocolEncoderOutput} by calling [EMAIL PROTECTED]
ProtocolEncoderOutput#write(Object)}.
* <p>
* Please refer to
* <a
href="../../../../../xref-examples/org/apache/mina/examples/reverser/TextLineEncoder.html"><code>TextLineEncoder</code></a>
@@ -45,8 +44,8 @@
* Encodes higher-level message objects into binary or protocol-specific
data.
* MINA invokes [EMAIL PROTECTED] #encode(IoSession, Object,
ProtocolEncoderOutput)}
* method with message which is popped from the session write queue, and
then
- * the encoder implementation puts encoded [EMAIL PROTECTED] IoBuffer}s
into
- * [EMAIL PROTECTED] ProtocolEncoderOutput}.
+ * the encoder implementation puts encoded messages (typically [EMAIL
PROTECTED] IoBuffer}s)
+ * into [EMAIL PROTECTED] ProtocolEncoderOutput}.
*
* @throws Exception if the message violated protocol specification
*/
