You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2018/05/21 14:04:05 UTC

[1/2] storm git commit: STORM-3070: Rewind buffer position if MessageDecoder encounters a BackpressureStatus message code, but the rest of the message hasn't been received yet

Repository: storm
Updated Branches:
  refs/heads/master fbeafdcbb -> afba24e79


STORM-3070: Rewind buffer position if MessageDecoder encounters a BackpressureStatus message code, but the rest of the message hasn't been received yet


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/eae4dc21
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/eae4dc21
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/eae4dc21

Branch: refs/heads/master
Commit: eae4dc216fc1cc858be929049d27254ad6ec0b8f
Parents: 5deba40
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Fri May 11 19:50:48 2018 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Fri May 11 19:50:48 2018 +0200

----------------------------------------------------------------------
 .../src/jvm/org/apache/storm/messaging/netty/MessageDecoder.java   | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/eae4dc21/storm-client/src/jvm/org/apache/storm/messaging/netty/MessageDecoder.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/MessageDecoder.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/MessageDecoder.java
index 11fb511..db34845 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/MessageDecoder.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/MessageDecoder.java
@@ -105,6 +105,8 @@ public class MessageDecoder extends FrameDecoder {
             if (code == BackPressureStatus.IDENTIFIER) {
                 available = buf.readableBytes();
                 if (available < 4) {
+                    //Need  more data
+                    buf.resetReaderIndex();
                     return null;
                 }
                 int dataLen = buf.readInt();


[2/2] storm git commit: Merge branch 'master' of https://github.com/srdo/storm into STORM-3070-merge

Posted by sr...@apache.org.
Merge branch 'master' of https://github.com/srdo/storm into STORM-3070-merge


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/afba24e7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/afba24e7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/afba24e7

Branch: refs/heads/master
Commit: afba24e79840026bf04582732ff0bfdd11659302
Parents: fbeafdc eae4dc2
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Mon May 21 16:03:09 2018 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Mon May 21 16:03:09 2018 +0200

----------------------------------------------------------------------
 .../src/jvm/org/apache/storm/messaging/netty/MessageDecoder.java   | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------