From 8c7539b20a08ae39345ee1cf73dccea792b2bd8a Mon Sep 17 00:00:00 2001 From: Andre F de Miranda Date: Tue, 17 Jan 2017 01:48:49 +1100 Subject: [PATCH] Revert "NIFI-3352 - Address issue where ListenLumberjack was sending long numbers back to clients - instead of int" This reverts commit 9609dafc34f40178d30480a41288fe4a89c2eb79. --- .../nifi/processors/lumberjack/frame/LumberjackDecoder.java | 2 +- .../nifi/processors/lumberjack/response/LumberjackResponse.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 9bc9468c86..eec9022291 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}" 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 850bba4b67..2ace3678d4 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(); }