< prev index next >
src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
Print this page
*** 577,589 ****
return generateBundle(bp.getBundleParamsAsMap());
} catch (Exception e) {
if (Log.isVerbose()) {
throw e;
} else {
! Log.error(e.getMessage());
if (e.getCause() != null && e.getCause() != e) {
! Log.error(e.getCause().getMessage());
}
return false;
}
}
}
--- 577,593 ----
return generateBundle(bp.getBundleParamsAsMap());
} catch (Exception e) {
if (Log.isVerbose()) {
throw e;
} else {
! String msg1 = e.getMessage();
! Log.error(msg1);
if (e.getCause() != null && e.getCause() != e) {
! String msg2 = e.getCause().getMessage();
! if (!msg1.contains(msg2)) {
! Log.error(msg2);
! }
}
return false;
}
}
}
*** 669,678 ****
--- 673,683 ----
List<jdk.jpackage.internal.Bundler> bundlers = getPlatformBundlers();
if (bundlers.isEmpty()) {
throw new PackagerException("ERR_InvalidInstallerType",
deployParams.getTargetFormat());
}
+ PackagerException pe = null;
for (jdk.jpackage.internal.Bundler bundler : bundlers) {
Map<String, ? super Object> localParams = new HashMap<>(params);
try {
if (bundler.validate(localParams)) {
File result =
*** 684,721 ****
throw new PackagerException("MSG_BundlerFailed",
bundler.getID(), bundler.getName());
}
bundleCreated = true; // at least one bundle was created
}
! } catch (UnsupportedPlatformException e) {
! throw new PackagerException(e,
! "MSG_BundlerPlatformException",
! bundler.getName());
} catch (ConfigException e) {
Log.debug(e);
! if (e.getAdvice() != null) {
! throw new PackagerException(e,
"MSG_BundlerConfigException",
! bundler.getName(), e.getMessage(), e.getAdvice());
! } else {
! throw new PackagerException(e,
"MSG_BundlerConfigExceptionNoAdvice",
bundler.getName(), e.getMessage());
}
} catch (RuntimeException re) {
Log.debug(re);
! throw new PackagerException(re, "MSG_BundlerRuntimeException",
bundler.getName(), re.toString());
} finally {
if (userProvidedBuildRoot) {
Log.verbose(MessageFormat.format(
I18N.getString("message.debug-working-directory"),
(new File(buildRoot)).getAbsolutePath()));
}
}
}
!
return bundleCreated;
}
private void addResources(DeployParams deployParams,
String inputdir, List<String> inputfiles) {
--- 689,737 ----
throw new PackagerException("MSG_BundlerFailed",
bundler.getID(), bundler.getName());
}
bundleCreated = true; // at least one bundle was created
}
! Log.verbose(MessageFormat.format(
! I18N.getString("message.bundle-created"),
! bundler.getName()));
! } catch (UnsupportedPlatformException upe) {
! Log.debug(upe);
! if (pe == null) {
! pe = new PackagerException(upe,
! "MSG_BundlerPlatformException", bundler.getName());
! }
} catch (ConfigException e) {
Log.debug(e);
! if (pe == null) {
! pe = (e.getAdvice() != null) ?
! new PackagerException(e,
"MSG_BundlerConfigException",
! bundler.getName(), e.getMessage(), e.getAdvice()) :
! new PackagerException(e,
"MSG_BundlerConfigExceptionNoAdvice",
bundler.getName(), e.getMessage());
}
} catch (RuntimeException re) {
Log.debug(re);
! if (pe == null) {
! pe = new PackagerException(re,
! "MSG_BundlerRuntimeException",
bundler.getName(), re.toString());
+ }
} finally {
if (userProvidedBuildRoot) {
Log.verbose(MessageFormat.format(
I18N.getString("message.debug-working-directory"),
(new File(buildRoot)).getAbsolutePath()));
}
}
}
! if (pe != null) {
! // throw packager exception only after trying all bundlers
! throw pe;
! }
return bundleCreated;
}
private void addResources(DeployParams deployParams,
String inputdir, List<String> inputfiles) {
< prev index next >