aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuarte Meneses <duarte.meneses@sonarsource.com>2016-03-15 15:31:06 +0100
committerDuarte Meneses <duarte.meneses@sonarsource.com>2016-03-15 15:31:06 +0100
commit35f6a66273ba7ee5815b1c35446f17da9b1b6f0b (patch)
treee0e0ed0ea5986de621eb627c9b925f8abefc7b6d
parent7b58f2b2b631ff3514c223dd0822c71ad8b3ee3b (diff)
downloadsonarqube-35f6a66273ba7ee5815b1c35446f17da9b1b6f0b.tar.gz
sonarqube-35f6a66273ba7ee5815b1c35446f17da9b1b6f0b.zip
SONAR-7158 Time limit for calculation of duplications is ineffective
-rw-r--r--sonar-batch/src/main/java/org/sonar/batch/cpd/CpdExecutor.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdExecutor.java b/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdExecutor.java
index 48ad1edb682..59a48f83fcf 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdExecutor.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdExecutor.java
@@ -110,7 +110,7 @@ public class CpdExecutor {
}
InputFile inputFile = (InputFile) component.inputComponent();
- progressReport.message(String.format("%d/%d - current file: %s", count, total, inputFile));
+ progressReport.message(String.format("%d/%d - current file: %s", count, total, inputFile.absolutePath()));
List<CloneGroup> duplications;
Future<List<CloneGroup>> futureResult = null;
@@ -123,13 +123,13 @@ public class CpdExecutor {
});
duplications = futureResult.get(TIMEOUT, TimeUnit.SECONDS);
} catch (TimeoutException e) {
- LOG.warn("Timeout during detection of duplications for " + inputFile, e);
+ LOG.warn("Timeout during detection of duplications for " + inputFile.absolutePath());
if (futureResult != null) {
futureResult.cancel(true);
}
return;
} catch (Exception e) {
- throw new IllegalStateException("Fail during detection of duplication for " + inputFile, e);
+ throw new IllegalStateException("Fail during detection of duplication for " + inputFile.absolutePath(), e);
}
List<CloneGroup> filtered;