From 5cb5deb5e5f41648120e8757104c0fd412483e26 Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Wed, 29 Jan 2020 10:06:07 -0600 Subject: SONAR-12802 SONAR-12927 Fix moved file detection for cobol and when calculating new lines --- .../src/main/java/org/sonar/db/source/FileSourceDao.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'server/sonar-db-dao/src') 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 fileUUids, ResultHandler rowHandler) { - for (List partition : toUniqueAndSortedPartitions(fileUUids)) { - mapper(dbSession).scrollLineHashes(partition, rowHandler); + for (List fileUuidsPartition : toUniqueAndSortedPartitions(fileUUids)) { + mapper(dbSession).scrollLineHashes(fileUuidsPartition, rowHandler); } } -- cgit v1.2.3