Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-1527: Fixed issue that resulted in resource claims' claimant count getting incremented twice on restart 

Signed-off-by: joewitt <joewitt@apache.org>
This commit is contained in:
Mark Payne 2016-02-21 20:58:19 -05:00 committed by joewitt
parent 4c5263220c
commit 122cba0ee7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
View File

@ -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();