aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@vespa.ai>2024-06-05 19:29:15 +0200
committerGitHub <noreply@github.com>2024-06-05 19:29:15 +0200
commitd40bdea2158bf51a45316799d26202a75e98e05b (patch)
tree81ab47abe7194a73828155432e95a5cb1761e5ca
parentec3c71067e5950a6573f67a0406acdc09beda411 (diff)
Revert "Catch correct exception"
-rw-r--r--config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
index dec0855105c..df62f762c40 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
@@ -53,7 +53,6 @@ import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
import java.nio.file.AccessDeniedException;
-import java.nio.file.DirectoryNotEmptyException;
import java.nio.file.Files;
import java.security.MessageDigest;
import java.util.ArrayList;
@@ -625,7 +624,7 @@ public class FilesApplicationPackage extends AbstractApplicationPackage {
// if it fails (with DirectoryNotEmptyException (!)) we need to use 'copy' instead
// (this will always be the case for the application package for a standalone container).
Files.move(tempDir, preprocessedDir.toPath());
- } catch (DirectoryNotEmptyException e) {
+ } catch (AccessDeniedException e) {
preprocess(appDir, preprocessedDir, zone);
}
FilesApplicationPackage preprocessedApp = fromFile(preprocessedDir, includeSourceFiles);