Skip to content

8272815: jpackage --type rpm produces an error: Invalid or unsupported type: [null] #5512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

8272815: jpackage --type rpm produces an error: Invalid or unsupported type: [null] #5512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
caac338
8272815: jpackage --type rpm produces an error: Invalid or unsupporte…
alexeysemenyukoracle Sep 14, 2021
44cf9fd
dummy commit
alexeysemenyukoracle Sep 14, 2021
a7534c7
dummy commit
alexeysemenyukoracle Sep 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Properties;
import java.util.ResourceBundle;
import java.util.jar.Attributes;
Expand Down Expand Up @@ -635,15 +636,13 @@ private jdk.jpackage.internal.Bundler getPlatformBundler() {
for (jdk.jpackage.internal.Bundler bundler :
Bundlers.createBundlersInstance().getBundlers(bundleType)) {
if (type == null) {
if (bundler.isDefault()
&& bundler.supported(runtimeInstaller)) {
return bundler;
}
if (bundler.isDefault()) {
return bundler;
}
} else {
if ((appImage || type.equalsIgnoreCase(bundler.getID()))
&& bundler.supported(runtimeInstaller)) {
return bundler;
}
if (appImage || type.equalsIgnoreCase(bundler.getID())) {
return bundler;
}
}
}
return null;
Expand All @@ -652,8 +651,6 @@ private jdk.jpackage.internal.Bundler getPlatformBundler() {
private void generateBundle(Map<String,? super Object> params)
throws PackagerException {

boolean bundleCreated = false;

// the temp dir needs to be fetched from the params early,
// to prevent each copy of the params (such as may be used for
// additional launchers) from generating a separate temp dir when
Expand All @@ -665,9 +662,10 @@ private void generateBundle(Map<String,? super Object> params)
// determine what bundler to run
jdk.jpackage.internal.Bundler bundler = getPlatformBundler();

if (bundler == null) {
throw new PackagerException("ERR_InvalidInstallerType",
deployParams.getTargetFormat());
if (bundler == null || !bundler.supported(runtimeInstaller)) {
String type = Optional.ofNullable(bundler).map(Bundler::getID).orElseGet(
() -> deployParams.getTargetFormat());
throw new PackagerException("ERR_InvalidInstallerType", type);
}

Map<String, ? super Object> localParams = new HashMap<>(params);
Expand Down
6 changes: 3 additions & 3 deletions test/jdk/tools/jpackage/share/jdk/jpackage/tests/ErrorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

/*
* @test
* @summary jpackage application version testing
* @summary Test jpackage output for erroneous input
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.jpackage/jdk.jpackage.internal
Expand All @@ -44,7 +44,7 @@

/*
* @test
* @summary jpackage application version testing
* @summary Test jpackage output for erroneous input
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.jpackage/jdk.jpackage.internal
Expand Down Expand Up @@ -96,7 +96,7 @@ public static Collection input() {
{"Hello",
new String[]{"--type", "invalid-type"},
null,
"Invalid or unsupported type:"},
"Invalid or unsupported type: [invalid-type]"},
// no --input
{"Hello",
null,
Expand Down