You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/07/27 19:21:09 UTC
svn commit: r560324 - in /mina/branches/1.0:
core/src/main/java/org/apache/mina/common/support/
core/src/main/java/org/apache/mina/filter/codec/
core/src/main/java/org/apache/mina/transport/socket/nio/
core/src/main/java/org/apache/mina/transport/socke...
Author: trustin
Date: Fri Jul 27 10:21:08 2007
New Revision: 560324
URL: http://svn.apache.org/viewvc?view=rev&rev=560324
Log:
reverted back the changes relates with DIRMINA-405
Modified:
mina/branches/1.0/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java
mina/branches/1.0/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
mina/branches/1.0/core/src/main/java/org/apache/mina/util/ByteBufferUtil.java
mina/branches/1.0/filter-compression/src/main/java/org/apache/mina/filter/CompressionFilter.java
Modified: mina/branches/1.0/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java
URL: http://svn.apache.org/viewvc/mina/branches/1.0/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java?view=diff&rev=560324&r1=560323&r2=560324
==============================================================================
--- mina/branches/1.0/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java (original)
+++ mina/branches/1.0/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java Fri Jul 27 10:21:08 2007
@@ -565,9 +565,7 @@
public void messageReceived(NextFilter nextFilter, IoSession session,
Object message) throws Exception {
try {
- if (!ByteBufferUtil.isEmpty(message)) {
- session.getHandler().messageReceived(session, message);
- }
+ session.getHandler().messageReceived(session, message);
} finally {
ByteBufferUtil.releaseIfPossible(message);
}
Modified: mina/branches/1.0/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
URL: http://svn.apache.org/viewvc/mina/branches/1.0/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java?view=diff&rev=560324&r1=560323&r2=560324
==============================================================================
--- mina/branches/1.0/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java (original)
+++ mina/branches/1.0/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java Fri Jul 27 10:21:08 2007
@@ -149,10 +149,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/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
URL: http://svn.apache.org/viewvc/mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java?view=diff&rev=560324&r1=560323&r2=560324
==============================================================================
--- mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java (original)
+++ mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java Fri Jul 27 10:21:08 2007
@@ -29,7 +29,6 @@
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.TrafficMask;
import org.apache.mina.common.IoFilter.WriteRequest;
import org.apache.mina.common.WriteTimeoutException;
import org.apache.mina.util.NamePreservingRunnable;
@@ -456,19 +455,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/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
URL: http://svn.apache.org/viewvc/mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java?view=diff&rev=560324&r1=560323&r2=560324
==============================================================================
--- mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java (original)
+++ mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java Fri Jul 27 10:21:08 2007
@@ -36,7 +36,6 @@
import org.apache.mina.common.IoServiceConfig;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionRecycler;
-import org.apache.mina.common.TrafficMask;
import org.apache.mina.common.IoFilter.WriteRequest;
import org.apache.mina.common.support.AbstractIoFilterChain;
import org.apache.mina.common.support.BaseIoConnector;
@@ -292,19 +291,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/branches/1.0/core/src/main/java/org/apache/mina/util/ByteBufferUtil.java
URL: http://svn.apache.org/viewvc/mina/branches/1.0/core/src/main/java/org/apache/mina/util/ByteBufferUtil.java?view=diff&rev=560324&r1=560323&r2=560324
==============================================================================
--- mina/branches/1.0/core/src/main/java/org/apache/mina/util/ByteBufferUtil.java (original)
+++ mina/branches/1.0/core/src/main/java/org/apache/mina/util/ByteBufferUtil.java Fri Jul 27 10:21:08 2007
@@ -39,14 +39,6 @@
((ByteBuffer) message).release();
}
}
-
- public static boolean isEmpty(Object message) {
- if (message instanceof ByteBuffer) {
- return !((ByteBuffer) message).hasRemaining();
- } else {
- return false;
- }
- }
private ByteBufferUtil() {
}
Modified: mina/branches/1.0/filter-compression/src/main/java/org/apache/mina/filter/CompressionFilter.java
URL: http://svn.apache.org/viewvc/mina/branches/1.0/filter-compression/src/main/java/org/apache/mina/filter/CompressionFilter.java?view=diff&rev=560324&r1=560323&r2=560324
==============================================================================
--- mina/branches/1.0/filter-compression/src/main/java/org/apache/mina/filter/CompressionFilter.java (original)
+++ mina/branches/1.0/filter-compression/src/main/java/org/apache/mina/filter/CompressionFilter.java Fri Jul 27 10:21:08 2007
@@ -156,14 +156,9 @@
}
ByteBuffer inBuffer = (ByteBuffer) message;
- if (!inBuffer.hasRemaining()) {
- // Ignore empty buffers
- nextFilter.messageReceived(session, inBuffer);
- } else {
- ByteBuffer outBuffer = inflater.inflate(inBuffer);
- inBuffer.release();
- nextFilter.messageReceived(session, outBuffer);
- }
+ ByteBuffer outBuffer = inflater.inflate(inBuffer);
+ inBuffer.release();
+ nextFilter.messageReceived(session, outBuffer);
}
/*