Author: trustin
Date: Fri Jul 27 10:12:26 2007
New Revision: 560320
URL: http://svn.apache.org/viewvc?view=rev&rev=560320
Log:
reverted back the changes relates with DIRMINA-405
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.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/support/SimpleProtocolDecoderOutput.java
mina/trunk/core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/CompressionFilter.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java?view=diff&rev=560320&r1=560319&r2=560320
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java
Fri Jul 27 10:12:26 2007
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoFilter;
@@ -610,10 +609,7 @@
@Override
public void messageReceived(NextFilter nextFilter, IoSession session,
Object message) throws Exception {
- if (!(message instanceof ByteBuffer) || ((ByteBuffer)
message).hasRemaining()) {
- // Empty buffers are used as a special internal signal, so
ignore it.
- session.getHandler().messageReceived(session, message);
- }
+ session.getHandler().messageReceived(session, message);
}
@Override
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?view=diff&rev=560320&r1=560319&r2=560320
==============================================================================
---
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
Fri Jul 27 10:12:26 2007
@@ -157,10 +157,8 @@
ProtocolDecoderOutput decoderOut = getDecoderOut(session, nextFilter);
try {
- if (in.hasRemaining()) {
- synchronized (decoderOut) {
- decoder.decode(session, in, decoderOut);
- }
+ synchronized (decoderOut) {
+ decoder.decode(session, in, decoderOut);
}
} catch (Throwable t) {
ProtocolDecoderException pde;
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java?view=diff&rev=560320&r1=560319&r2=560320
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java
Fri Jul 27 10:12:26 2007
@@ -45,25 +45,21 @@
this.nextFilter = nextFilter;
this.session = session;
}
-
+
public void write(Object message) {
if (message == null) {
throw new NullPointerException("message");
}
messageQueue.offer(message);
+ if (session instanceof BaseIoSession) {
+ ((BaseIoSession) session).increaseReadMessages();
+ }
}
public void flush() {
while (!messageQueue.isEmpty()) {
- if (session.getTrafficMask().isReadable()) {
- if (session instanceof BaseIoSession) {
- ((BaseIoSession) session).increaseReadMessages();
- }
- nextFilter.messageReceived(session, messageQueue.poll());
- } else {
- break;
- }
+ nextFilter.messageReceived(session, messageQueue.poll());
}
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java?view=diff&rev=560320&r1=560319&r2=560320
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java
Fri Jul 27 10:12:26 2007
@@ -25,7 +25,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoEventType;
import org.apache.mina.common.IoFilterAdapter;
@@ -167,12 +166,6 @@
@Override
public void messageReceived( NextFilter nextFilter, IoSession session,
Object message ) throws Exception
{
- if (message instanceof ByteBuffer && !((ByteBuffer)
message).hasRemaining()) {
- // Ignore the special signal.
- nextFilter.messageReceived(session, message);
- return;
- }
-
long start = timeUnit.timeNow();
nextFilter.messageReceived( session, message );
long end = timeUnit.timeNow();
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java?view=diff&rev=560320&r1=560319&r2=560320
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
Fri Jul 27 10:12:26 2007
@@ -35,7 +35,6 @@
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIOException;
-import org.apache.mina.common.TrafficMask;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.WriteTimeoutException;
import org.apache.mina.common.support.IoServiceListenerSupport;
@@ -451,19 +450,8 @@
}
// Now mask the preferred ops with the mask of the current session
- TrafficMask trafficMask = session.getTrafficMask();
- int opsMask = trafficMask.getInterestOps();
- if ((key.interestOps() & SelectionKey.OP_READ) == 0 &&
- trafficMask.isReadable()) {
- // This is a somewhat ugly workaround for the case that
- // ProtocolCodecFilter is in the filter chain.
- // Firing messageReceived() event with an empty buffer
- // triggers ProtocolCodecFilter to flush any queued
- // messageReceived() events on resumeRead().
- session.getFilterChain().fireMessageReceived(
- session, ByteBuffer.EMPTY_BUFFER);
- }
- key.interestOps(ops & opsMask);
+ int mask = session.getTrafficMask().getInterestOps();
+ key.interestOps(ops & mask);
}
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java?view=diff&rev=560320&r1=560319&r2=560320
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
Fri Jul 27 10:12:26 2007
@@ -36,7 +36,6 @@
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIOException;
-import org.apache.mina.common.TrafficMask;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.support.AbstractIoFilterChain;
@@ -225,19 +224,8 @@
}
// Now mask the preferred ops with the mask of the current session
- TrafficMask trafficMask = session.getTrafficMask();
- int opsMask = trafficMask.getInterestOps();
- if ((key.interestOps() & SelectionKey.OP_READ) == 0 &&
- trafficMask.isReadable()) {
- // This is a somewhat ugly workaround for the case that
- // ProtocolCodecFilter is in the filter chain.
- // Firing messageReceived() event with an empty buffer
- // triggers ProtocolCodecFilter to flush any queued
- // messageReceived() events on resumeRead().
- session.getFilterChain().fireMessageReceived(
- session, ByteBuffer.wrap(new byte[0]));
- }
- key.interestOps(ops & opsMask);
+ int mask = session.getTrafficMask().getInterestOps();
+ key.interestOps(ops & mask);
}
}
Modified:
mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/CompressionFilter.java
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/CompressionFilter.java?view=diff&rev=560320&r1=560319&r2=560320
==============================================================================
---
mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/CompressionFilter.java
(original)
+++
mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/CompressionFilter.java
Fri Jul 27 10:12:26 2007
@@ -159,13 +159,8 @@
}
ByteBuffer inBuffer = (ByteBuffer) message;
- if (!inBuffer.hasRemaining()) {
- // Ignore empty buffers
- nextFilter.messageReceived(session, inBuffer);
- } else {
- ByteBuffer outBuffer = inflater.inflate(inBuffer);
- nextFilter.messageReceived(session, outBuffer);
- }
+ ByteBuffer outBuffer = inflater.inflate(inBuffer);
+ nextFilter.messageReceived(session, outBuffer);
}
/*
