From 4ef1d94e3f995ce7a378bb7c48579f4c39e1945e Mon Sep 17 00:00:00 2001
From: nkindlon <nek3d@virginia.edu>
Date: Wed, 23 Apr 2014 15:57:59 -0400
Subject: [PATCH] Test commit
---
src/utils/FileRecordTools/FileRecordMergeMgr.cpp | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/utils/FileRecordTools/FileRecordMergeMgr.cpp b/src/utils/FileRecordTools/FileRecordMergeMgr.cpp
index f4c39f12..c3b5969a 100644
--- a/src/utils/FileRecordTools/FileRecordMergeMgr.cpp
+++ b/src/utils/FileRecordTools/FileRecordMergeMgr.cpp
@@ -95,16 +95,14 @@ Record *FileRecordMergeMgr::getNextRecord(RecordKeyList *recList)
//check that we are still on the same chromosome.
const QuickString &newChrom = nextRecord->getChrName();
if (newChrom != currChrom) { //hit a different chromosome.
- if (_foundChroms.find(newChrom) == _foundChroms.end() || takenFromStorage) {
- //haven't seen this chromosome before, sort order is already enforced in the base class method.
- if (!mustDelete) {
- addToStorage(nextRecord);
- } else {
- deleteRecord(nextRecord);
- }
- nextRecord = NULL;
- break;
+ //haven't seen this chromosome before, sort order is already enforced in the base class method.
+ if (!mustDelete) {
+ addToStorage(nextRecord);
+ } else {
+ deleteRecord(nextRecord);
}
+ nextRecord = NULL;
+ break;
}
//check whether it's in range
--
GitLab