--- old/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java 2019-07-22 21:57:04.192262500 -0400
+++ new/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java 2019-07-22 21:57:02.195411300 -0400
@@ -327,7 +327,8 @@
String[] lines = cplData.split("\n");
try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(
cpl.toPath()))) {
- boolean skip = false; // Used to skip Java.runtime bundle, since
+ int skip = 0;
+ // Used to skip Java.runtime bundle, since
// pkgbuild with --root will find two bundles app and Java runtime.
// We cannot generate component proprty list when using
// --component argument.
@@ -337,11 +338,11 @@
out.println("");
i++;
} else if (lines[i].trim().equals("ChildBundles")) {
- skip = true;
- } else if (skip && lines[i].trim().equals("")) {
- skip = false;
+ ++skip;
+ } else if ((skip > 0) && lines[i].trim().equals("")) {
+ --skip;
} else {
- if (!skip) {
+ if (skip == 0) {
out.println(lines[i]);
}
}