Skip to content

Commit eeae82f

Browse files
Implementation Tweaks #1
1 parent 9674837 commit eeae82f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -593,11 +593,11 @@ public boolean test(TaskID taskID) {
593593

594594
if (pkg.isPresent() && !pkg.orElseThrow().test(taskID)) {
595595
return false;
596-
} else if (pkg.isEmpty() && isPackageTask) {
597-
// Building application image, skip packaging tasks.
596+
} else if (pkg.isEmpty() && (isPackageTask || isCopyAppImageTask)) {
597+
// Building application image, skip packaging and copying app image tasks.
598598
return false;
599-
} else if (app.runtimeBuilder().isEmpty() && isBuildApplicationImageTask && !isCopyAppImageTask) {
600-
// Runtime builder is not present, skip building application image tasks.
599+
} else if (pkg.isPresent() && app.runtimeBuilder().isEmpty() && isBuildApplicationImageTask && !isCopyAppImageTask) {
600+
// Building a package, runtime builder is not present, skip building application image tasks.
601601
return false;
602602
} else if (app.runtimeBuilder().isPresent() && isCopyAppImageTask && !isBuildApplicationImageTask) {
603603
// Runtime builder is present, skip copying app image tasks.

0 commit comments

Comments
 (0)