You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by af...@apache.org on 2017/01/16 14:53:53 UTC

nifi git commit: Revert "NIFI-3352 - Address issue where ListenLumberjack was sending long numbers back to clients - instead of int"

Repository: nifi
Updated Branches:
  refs/heads/master 5b69c97f4 -> 8c7539b20


Revert "NIFI-3352 - Address issue where ListenLumberjack was sending long numbers back to clients - instead of int"

This reverts commit 9609dafc34f40178d30480a41288fe4a89c2eb79.


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

Branch: refs/heads/master
Commit: 8c7539b20a08ae39345ee1cf73dccea792b2bd8a
Parents: 5b69c97
Author: Andre F de Miranda <tr...@users.noreply.github.com>
Authored: Tue Jan 17 01:48:49 2017 +1100
Committer: Andre F de Miranda <tr...@users.noreply.github.com>
Committed: Tue Jan 17 01:53:18 2017 +1100

----------------------------------------------------------------------
 .../apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java | 2 +-
 .../nifi/processors/lumberjack/response/LumberjackResponse.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/8c7539b2/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java b/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java
index 9bc9468..eec9022 100644
--- a/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java
+++ b/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java
@@ -161,7 +161,7 @@ public class LumberjackDecoder {
 
         // Lumberjack has a weird approach to frames, where compressed frames embed D(ata) or J(SON) frames.
         // inside a compressed input.
-        //  Or as stated in the documentation:
+        //  Or astated in the documentation:
         //
         // "As an example, you could have 3 data frames compressed into a single
         // 'compressed' frame type: 1D{k,v}{k,v}1D{k,v}{k,v}1D{k,v}{k,v}"

http://git-wip-us.apache.org/repos/asf/nifi/blob/8c7539b2/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/response/LumberjackResponse.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/response/LumberjackResponse.java b/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/response/LumberjackResponse.java
index 850bba4..2ace367 100644
--- a/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/response/LumberjackResponse.java
+++ b/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/response/LumberjackResponse.java
@@ -51,7 +51,7 @@ public class LumberjackResponse {
         return new LumberjackFrame.Builder()
                 .version(version)
                 .frameType(frameType)
-                .payload(ByteBuffer.allocate(4).putInt((int) seqNumber).array())
+                .payload(ByteBuffer.allocate(8).putLong(seqNumber).array())
                 .build();
     }