Repository: nifi Updated Branches: refs/heads/master 4c5263220 -> 122cba0ee
NIFI-1527: Fixed issue that resulted in resource claims' claimant count getting incremented twice on restart 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/122cba0e Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/122cba0e Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/122cba0e Branch: refs/heads/master Commit: 122cba0ee79b7a9bfdded094c76bc14f76735ca6 Parents: 4c52632 Author: Mark Payne <[email protected]> Authored: Sun Feb 21 20:58:19 2016 -0500 Committer: joewitt <[email protected]> Committed: Mon Feb 22 12:36:08 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/nifi/controller/FileSystemSwapManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/122cba0e/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java index 105dcff..00b52cc 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java @@ -239,8 +239,8 @@ public class FileSystemSwapManager implements FlowFileSwapManager { return swapLocations; } - @SuppressWarnings("deprecation") @Override + @SuppressWarnings("deprecation") public SwapSummary getSwapSummary(final String swapLocation) throws IOException { final File swapFile = new File(swapLocation); @@ -274,7 +274,7 @@ public class FileSystemSwapManager implements FlowFileSwapManager { // Before swap encoding version 8, we did not write out the max record id, so we have to read all // swap files to determine the max record id final List<ResourceClaim> resourceClaims = new ArrayList<>(numRecords); - final List<FlowFileRecord> records = deserializeFlowFiles(in, numRecords, swapEncodingVersion, true, claimManager); + final List<FlowFileRecord> records = deserializeFlowFiles(in, numRecords, swapEncodingVersion, false, claimManager); for (final FlowFileRecord record : records) { if (maxRecordId == null || record.getId() > maxRecordId) { maxRecordId = record.getId();
