Skip to content

Commit ff6df15

Browse files
author
Andy Herrick
committed
8256801: tools/jpackage/share/FileAssociationsTest.java#id0 failed unpack.bat with "Exit code: 1603"
Reviewed-by: asemenyuk, almatvee, kizune
1 parent 303631e commit ff6df15

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,11 @@ private static void runMsiexecWithRetries(Executor misexec) {
6565
Executor.Result result = null;
6666
for (int attempt = 0; attempt != 3; ++attempt) {
6767
result = misexec.executeWithoutExitCodeCheck();
68-
if (result.exitCode == 1618) {
68+
69+
// The given Executor may either be of an msiexe command or an
70+
// unpack.bat script containing the msiexec command. In the later
71+
// case, when misexec returns 1618, the unpack.bat may return 1603
72+
if ((result.exitCode == 1618) || (result.exitCode == 1603)) {
6973
// Another installation is already in progress.
7074
// Wait a little and try again.
7175
ThrowingRunnable.toRunnable(() -> Thread.sleep(3000)).run();

0 commit comments

Comments
 (0)