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:45:53 UTC
[1/2] nifi git commit: NIFI-3352 - Address issue where
ListenLumberjack was sending long numbers back to clients - instead of int
Repository: nifi
Updated Branches:
refs/heads/master def4918af -> 5b69c97f4
NIFI-3352 - Address issue where ListenLumberjack was sending long numbers back to clients - instead of int
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9609dafc
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9609dafc
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9609dafc
Branch: refs/heads/master
Commit: 9609dafc34f40178d30480a41288fe4a89c2eb79
Parents: def4918
Author: afucs <de...@varditlahav.com>
Authored: Sat Jan 14 22:57:33 2017 +1100
Committer: afucs <de...@varditlahav.com>
Committed: Sat Jan 14 22:57:33 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/9609dafc/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 eec9022..9bc9468 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 astated in the documentation:
+ // Or as stated 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/9609dafc/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 2ace367..850bba4 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(8).putLong(seqNumber).array())
+ .payload(ByteBuffer.allocate(4).putInt((int) seqNumber).array())
.build();
}
[2/2] nifi git commit: NIFI-2761 Fixed error message in bootstrap
Posted by af...@apache.org.
NIFI-2761 Fixed error message in bootstrap
This closes #1385
Signed-off-by: Andre F de Miranda <tr...@users.noreply.github.com>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/5b69c97f
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/5b69c97f
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/5b69c97f
Branch: refs/heads/master
Commit: 5b69c97f4157736c39b9d33e3beb43872979e2dc
Parents: 9609daf
Author: Pierre Villard <pi...@gmail.com>
Authored: Tue Jan 3 18:09:53 2017 +0100
Committer: Andre F de Miranda <tr...@users.noreply.github.com>
Committed: Tue Jan 17 01:43:15 2017 +1100
----------------------------------------------------------------------
.../src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/5b69c97f/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java
----------------------------------------------------------------------
diff --git a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java
index d925fa3..e53a4c4 100644
--- a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java
+++ b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java
@@ -57,7 +57,7 @@ public class BootstrapCodec {
try {
processRequest(cmd, args);
} catch (final InvalidCommandException ice) {
- throw new IOException("Received invalid command from NiFi: " + line + " : " + ice.getMessage() == null ? "" : "Details: " + ice.toString());
+ throw new IOException("Received invalid command from NiFi: " + line + (ice.getMessage() == null ? "" : " - Details: " + ice.toString()));
}
}