--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java Sun Jan 06 16:58:28 2019 -0500
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java Mon Jan 07 16:39:30 2019 -0500
@@ -549,40 +549,6 @@
} catch (IOException ex) {
Log.verbose(ex);
return null;
- } finally {
- try {
- if (imageDir != null &&
- PREDEFINED_APP_IMAGE.fetchFrom(p) == null &&
- (PREDEFINED_RUNTIME_IMAGE.fetchFrom(p) == null ||
- !Arguments.CREATE_JRE_INSTALLER.fetchFrom(p)) &&
- !Log.isDebug() &&
- !Log.isVerbose()) {
- IOUtils.deleteRecursive(imageDir);
- } else if (imageDir != null) {
- Log.verbose(MessageFormat.format(
- I18N.getString("message.debug-working-directory"),
- imageDir.getAbsolutePath()));
- }
-
- cleanupConfigFiles(p);
- } catch (IOException ex) {
- // noinspection ReturnInsideFinallyBlock
- Log.debug(ex.getMessage());
- return null;
- }
- }
- }
-
- protected void cleanupConfigFiles(Map<String, ? super Object> params) {
- if (Log.isDebug() || Log.isVerbose()) {
- return;
- }
-
- if (getConfig_ProjectFile(params) != null) {
- getConfig_ProjectFile(params).delete();
- }
- if (getConfig_Script(params) != null) {
- getConfig_Script(params).delete();
}
}