This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 3110a885036297e01b2aac98f62a0854cdefc6b8 Author: pmouawad <[email protected]> AuthorDate: Mon Sep 30 23:11:04 2019 +0200 Fix SONAR warning :Check delete result --- .../java/org/apache/jmeter/report/processor/ExternalSampleSorter.java | 4 +++- .../java/org/apache/jmeter/report/processor/SampleWriterConsumer.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java index 0b52913..d5530aa 100644 --- a/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java +++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java @@ -320,7 +320,9 @@ public class ExternalSampleSorter extends AbstractSampleConsumer { if (this.pool != null) { this.pool.shutdown(); } - getWorkingDirectory().delete(); + if (!getWorkingDirectory().delete()) { + LOG.warn("Was not able to delete folder {}", getWorkingDirectory()); + } } private File sortAndDump(final List<Sample> samples, diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/SampleWriterConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleWriterConsumer.java index 6046345..b343e8d 100644 --- a/src/core/src/main/java/org/apache/jmeter/report/processor/SampleWriterConsumer.java +++ b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleWriterConsumer.java @@ -117,6 +117,8 @@ public class SampleWriterConsumer extends AbstractSampleConsumer { for (int i = 0; i < channelsCount; i++) { csvWriters[i].close(); } - getWorkingDirectory().delete(); + if (!getWorkingDirectory().delete()) { + LOG.warn("Was not able to delete folder {}", getWorkingDirectory()); + } } }
