Skip to content

Commit 20ea57d

Browse files
Remove dead code. Exceptions with message.app-image-dir-does-not-exist id never thrown, because DeployParams.validate() would throw ERR_AppImageNotExist early
1 parent 534c5ff commit 20ea57d

File tree

3 files changed

+1
-21
lines changed

3 files changed

+1
-21
lines changed

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,16 +141,6 @@ protected void validateAppImageAndBundeler(
141141
Map<String, ? super Object> params) throws ConfigException {
142142
if (PREDEFINED_APP_IMAGE.fetchFrom(params) != null) {
143143
Path applicationImage = PREDEFINED_APP_IMAGE.fetchFrom(params);
144-
if (!IOUtils.exists(applicationImage)) {
145-
throw new ConfigException(
146-
MessageFormat.format(I18N.getString(
147-
"message.app-image-dir-does-not-exist"),
148-
PREDEFINED_APP_IMAGE.getID(),
149-
applicationImage.toString()),
150-
MessageFormat.format(I18N.getString(
151-
"message.app-image-dir-does-not-exist.advice"),
152-
PREDEFINED_APP_IMAGE.getID()));
153-
}
154144
if (AppImageFile.load(applicationImage).isSigned()) {
155145
if (!Files.exists(
156146
PackageFile.getPathInAppImage(applicationImage))) {

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -568,15 +568,7 @@ static boolean hasPredefinedAppImage(Map<String, ? super Object> params) {
568568
}
569569

570570
static Path getPredefinedAppImage(Map<String, ? super Object> params) {
571-
Path applicationImage = PREDEFINED_APP_IMAGE.fetchFrom(params);
572-
if (applicationImage != null && !IOUtils.exists(applicationImage)) {
573-
throw new RuntimeException(
574-
MessageFormat.format(I18N.getString(
575-
"message.app-image-dir-does-not-exist"),
576-
PREDEFINED_APP_IMAGE.getID(),
577-
applicationImage.toString()));
578-
}
579-
return applicationImage;
571+
return PREDEFINED_APP_IMAGE.fetchFrom(params);
580572
}
581573

582574
static void copyPredefinedRuntimeImage(Map<String, ? super Object> params,

src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ message.no-default-resource=no default package resource {0} {1} (add {2} to the
3535
message.using-custom-resource-from-file=Using custom package resource {0} (loaded from file {1}).
3636
message.using-custom-resource=Using custom package resource {0} (loaded from {1}).
3737
message.creating-app-bundle=Creating app package: {0} in {1}
38-
message.app-image-dir-does-not-exist=Specified application image directory {0}: {1} does not exist
39-
message.app-image-dir-does-not-exist.advice=Confirm that the value for {0} exists
4038
message.runtime-image-dir-does-not-exist=Specified runtime image directory {0}: {1} does not exist
4139
message.resource-dir-does-not-exist=Specified resource directory {0}: {1} does not exist
4240
message.debug-working-directory=Kept working directory for debug: {0}

0 commit comments

Comments
 (0)