Skip to content
Permalink
Browse files
Merge branch 'cassandra-4.1' into trunk
  • Loading branch information
David Capwell committed May 4, 2022
2 parents 6c20fbc + 559b17f commit 0541e5b078a2fe6cb0199e72f1a735a6f565ef08
Showing 2 changed files with 6 additions and 2 deletions.
@@ -1,4 +1,6 @@
4.2
Merged from 4.1:
* nodetool enablefullquerylog can NPE when directory has no files (CASSANDRA-17595)
Merged from 4.0:
Merged from 3.11:
Merged from 3.0:
@@ -486,9 +486,11 @@ private static Throwable deleteRecursively(File fileOrDirectory, Throwable accum
{
if (fileOrDirectory.isDirectory())
{
for (File f : fileOrDirectory.tryList())
File[] files = fileOrDirectory.tryList();
if (files != null)
{
accumulate = FileUtils.deleteWithConfirm(f, accumulate);
for (File f : files)
accumulate = FileUtils.deleteWithConfirm(f, accumulate);
}
}
return FileUtils.deleteWithConfirm(fileOrDirectory, accumulate);

0 comments on commit 0541e5b

Please sign in to comment.