You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by je...@apache.org on 2013/04/10 11:46:10 UTC
[1/2] git commit: Protect codec filter against decoder returning
empty list
Updated Branches:
refs/heads/trunk 9d151a55c -> 76916a216
Protect codec filter against decoder returning empty list
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/9284a78c
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/9284a78c
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/9284a78c
Branch: refs/heads/trunk
Commit: 9284a78cca1a611c74c12b7030319e0f3a1a6046
Parents: 9d151a5
Author: Jeff MAURY <je...@apache.org>
Authored: Wed Apr 10 11:28:53 2013 +0200
Committer: Jeff MAURY <je...@apache.org>
Committed: Wed Apr 10 11:28:53 2013 +0200
----------------------------------------------------------------------
.../mina/filter/codec/ProtocolCodecFilter.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/9284a78c/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java b/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
index e538acb..1773a59 100644
--- a/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
+++ b/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
@@ -87,7 +87,7 @@ public class ProtocolCodecFilter<MESSAGE, ENCODED, ENCODING_STATE, DECODING_STAT
// Loop until the decoder cannot decode more
MESSAGE[] msg;
try {
- while ((msg = decoder.decode((ENCODED) in, state)) != null) {
+ while (((msg = decoder.decode((ENCODED) in, state)) != null) && (msg.length > 0)) {
for (MESSAGE m : msg) {
controller.callReadNextFilter(m);
}
[2/2] git commit: Fix SSL send process exception and enable SSLTest
as it is now running
Posted by je...@apache.org.
Fix SSL send process exception and enable SSLTest as it is now running
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/76916a21
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/76916a21
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/76916a21
Branch: refs/heads/trunk
Commit: 76916a21660eb6e0b75f53120c92989ecaae7e90
Parents: 9284a78
Author: Jeff MAURY <je...@apache.org>
Authored: Wed Apr 10 11:29:55 2013 +0200
Committer: Jeff MAURY <je...@apache.org>
Committed: Wed Apr 10 11:29:55 2013 +0200
----------------------------------------------------------------------
.../org/apache/mina/session/AbstractIoSession.java | 2 +-
.../org/apache/mina/transport/tcp/SslTest.java | 1 -
2 files changed, 1 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/76916a21/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/mina/session/AbstractIoSession.java b/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
index a9fa8a5..26e6731 100644
--- a/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
+++ b/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
@@ -567,7 +567,7 @@ public abstract class AbstractIoSession implements IoSession, ReadFilterChainCon
throw new IllegalStateException();
}
- writeRequest = sslHelper.processWrite(this, writeRequest, writeQueue);
+ writeRequest = sslHelper.processWrite(this, writeRequest.getMessage(), writeQueue);
}
synchronized (writeQueue) {
http://git-wip-us.apache.org/repos/asf/mina/blob/76916a21/core/src/test/java/org/apache/mina/transport/tcp/SslTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/mina/transport/tcp/SslTest.java b/core/src/test/java/org/apache/mina/transport/tcp/SslTest.java
index fb4aabd..fb1532a 100644
--- a/core/src/test/java/org/apache/mina/transport/tcp/SslTest.java
+++ b/core/src/test/java/org/apache/mina/transport/tcp/SslTest.java
@@ -152,7 +152,6 @@ public class SslTest {
}
@Test
- @Ignore("Waiting for the SSLHelper to be refactored")
public void testSSL() throws Exception {
final int port = startServer();