diff options
author | Duarte Meneses <duarte.meneses@sonarsource.com> | 2020-01-29 10:06:07 -0600 |
---|---|---|
committer | SonarTech <sonartech@sonarsource.com> | 2020-02-07 20:46:16 +0100 |
commit | 5cb5deb5e5f41648120e8757104c0fd412483e26 (patch) | |
tree | 8aff386899611cf48e4260f55b3fc75db193ccab /server/sonar-db-dao/src | |
parent | 86c268c89ad50f76cf1c9289396639507f377f06 (diff) | |
download | sonarqube-5cb5deb5e5f41648120e8757104c0fd412483e26.tar.gz sonarqube-5cb5deb5e5f41648120e8757104c0fd412483e26.zip |
SONAR-12802 SONAR-12927 Fix moved file detection for cobol and when calculating new lines
Diffstat (limited to 'server/sonar-db-dao/src')
-rw-r--r-- | server/sonar-db-dao/src/main/java/org/sonar/db/source/FileSourceDao.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/source/FileSourceDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/source/FileSourceDao.java index 7b235580598..ff006368b28 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/source/FileSourceDao.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/source/FileSourceDao.java @@ -50,7 +50,7 @@ public class FileSourceDao implements Dao { @CheckForNull public LineHashVersion selectLineHashesVersion(DbSession dbSession, String fileUuid) { Integer version = mapper(dbSession).selectLineHashesVersion(fileUuid); - return version == null ? LineHashVersion.WITHOUT_SIGNIFICANT_CODE : LineHashVersion.valueOf(version); + return version == null ? null : LineHashVersion.valueOf(version); } @CheckForNull @@ -82,8 +82,8 @@ public class FileSourceDao implements Dao { * uuids in no specific order with 'SOURCE' source and a non null path. */ public void scrollLineHashes(DbSession dbSession, Collection<String> fileUUids, ResultHandler<LineHashesWithUuidDto> rowHandler) { - for (List<String> partition : toUniqueAndSortedPartitions(fileUUids)) { - mapper(dbSession).scrollLineHashes(partition, rowHandler); + for (List<String> fileUuidsPartition : toUniqueAndSortedPartitions(fileUUids)) { + mapper(dbSession).scrollLineHashes(fileUuidsPartition, rowHandler); } } |