Repository: nifi Updated Branches: refs/heads/master 7bcccb10f -> a0b2311ff
NIFI-3995: This closes #1873. No longer use the 14th byte in the header for hwx content-encoded schema reference Signed-off-by: joewitt <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a0b2311f Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a0b2311f Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a0b2311f Branch: refs/heads/master Commit: a0b2311ff6a81dfa33e652e754368f5404ace7d5 Parents: 7bcccb1 Author: Mark Payne <[email protected]> Authored: Wed May 31 12:20:02 2017 -0400 Committer: joewitt <[email protected]> Committed: Wed May 31 13:41:25 2017 -0400 ---------------------------------------------------------------------- .../schema/access/HortonworksEncodedSchemaReferenceStrategy.java | 2 +- .../schema/access/HortonworksEncodedSchemaReferenceWriter.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/a0b2311f/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/schema/access/HortonworksEncodedSchemaReferenceStrategy.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/schema/access/HortonworksEncodedSchemaReferenceStrategy.java b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/schema/access/HortonworksEncodedSchemaReferenceStrategy.java index 27bf16f..de89900 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/schema/access/HortonworksEncodedSchemaReferenceStrategy.java +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/schema/access/HortonworksEncodedSchemaReferenceStrategy.java @@ -46,7 +46,7 @@ public class HortonworksEncodedSchemaReferenceStrategy implements SchemaAccessSt @Override public RecordSchema getSchema(final FlowFile flowFile, final InputStream contentStream) throws SchemaNotFoundException, IOException { - final byte[] buffer = new byte[14]; + final byte[] buffer = new byte[13]; try { StreamUtils.fillBuffer(contentStream, buffer); } catch (final IOException ioe) { http://git-wip-us.apache.org/repos/asf/nifi/blob/a0b2311f/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/schema/access/HortonworksEncodedSchemaReferenceWriter.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/schema/access/HortonworksEncodedSchemaReferenceWriter.java b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/schema/access/HortonworksEncodedSchemaReferenceWriter.java index 2e3e602..87d7f0b 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/schema/access/HortonworksEncodedSchemaReferenceWriter.java +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/schema/access/HortonworksEncodedSchemaReferenceWriter.java @@ -47,7 +47,6 @@ public class HortonworksEncodedSchemaReferenceWriter implements SchemaAccessWrit bb.put((byte) LATEST_PROTOCOL_VERSION); bb.putLong(id); bb.putInt(version); - bb.put((byte) 0); // We always use generic records out.write(bb.array()); }
