You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2014/09/11 09:31:17 UTC
git commit: Applied the suggested patch from DIRMINA-972
Repository: mina
Updated Branches:
refs/heads/2.0 56a6e5800 -> af34f5087
Applied the suggested patch from DIRMINA-972
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/af34f508
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/af34f508
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/af34f508
Branch: refs/heads/2.0
Commit: af34f5087926b6e44c62033567123244cabed1f8
Parents: 56a6e58
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Thu Sep 11 09:31:06 2014 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Thu Sep 11 09:31:06 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/mina/filter/ssl/SslHandler.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/af34f508/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
index f801d7b..eb6e2a3 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
@@ -395,9 +395,14 @@ class SslHandler {
* @return buffer with data
*/
/* no qualifier */IoBuffer fetchAppBuffer() {
- IoBuffer appBuffer = this.appBuffer.flip();
- this.appBuffer = null;
- return appBuffer;
+ if (this.appBuffer == null) {
+ return IoBuffer.allocate(0);
+ } else {
+ IoBuffer appBuffer = this.appBuffer.flip();
+ this.appBuffer = null;
+
+ return appBuffer;
+ }
}
/**