From: Duarte Meneses <duarte.meneses@sonarsource.com>
Date: Tue, 15 Mar 2016 14:31:06 +0000 (+0100)
Subject: SONAR-7158 Time limit for calculation of duplications is ineffective
X-Git-Tag: 5.5-M11~151
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=35f6a66273ba7ee5815b1c35446f17da9b1b6f0b;p=sonarqube.git

SONAR-7158 Time limit for calculation of duplications is ineffective
---

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;