You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2016/02/22 18:29:09 UTC
nifi git commit: NIFI-1527: Fixed issue that resulted in resource
claims' claimant count getting incremented twice on restart
Repository: nifi
Updated Branches:
refs/heads/support/nifi-0.5.x e15a2b32d -> 5da9f985b
NIFI-1527: Fixed issue that resulted in resource claims' claimant count getting incremented twice on restart
Signed-off-by: joewitt <jo...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/5da9f985
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/5da9f985
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/5da9f985
Branch: refs/heads/support/nifi-0.5.x
Commit: 5da9f985bfda7bdcbb102857899fdecb98658e64
Parents: e15a2b3
Author: Mark Payne <ma...@hotmail.com>
Authored: Sun Feb 21 20:58:19 2016 -0500
Committer: joewitt <jo...@apache.org>
Committed: Sun Feb 21 22:57:18 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/5da9f985/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();