From 699671cb822e92e819883ab36a1a4aef820a817c Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Fri, 3 Dec 2021 13:44:34 +0100
Subject: [PATCH] Ported forward additional changes for TaskOutputsBackup.

^KT-49782 Fixed
---
 .../org/jetbrains/kotlin/gradle/tasks/TasksOutputsBackup.kt    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksOutputsBackup.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksOutputsBackup.kt
index 89b41c32601..b98194f8237 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksOutputsBackup.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksOutputsBackup.kt
@@ -44,7 +44,7 @@ internal class TaskOutputsBackup(
         // property. To avoid snapshot sync collisions, each snapshot output directory has also 'index' as prefix.
         outputs.toSortedSet().forEachIndexed { index, outputPath ->
             val pathInSnapshot = "$index${File.separator}${outputPath.pathRelativeToBuildDirectory}"
-            if (outputPath.isDirectory) {
+            if (outputPath.isDirectory && Files.list(outputPath.toPath()).use { it.findFirst().isPresent }) {
                 snapshotsDir
                     .map { it.file(pathInSnapshot) }
                     .get()
@@ -121,7 +121,6 @@ internal class TaskOutputsBackup(
                     zip.closeEntry()
                 }
             zip.flush()
-            zip.close()
         }
     }