Mercurial > hg > release > icedtea-web-1.7
changeset 1390:b1fd49e9cd8f
On windows, shutdown hook added like we do, via lazy initiated OutputController (which may be swing/awt hidden call (not verified)) causes exception "can't add shutdown hook, shutdown already in progress"
* netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java: (main) enforced headless mode, to prevent itw debug console from showing.
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Mon, 10 Apr 2017 13:10:17 +0200 |
| parents | f63de124adc4 |
| children | cd4cbbbc6e31 |
| files | ChangeLog netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java |
| diffstat | 2 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Apr 06 15:31:12 2017 +0200 +++ b/ChangeLog Mon Apr 10 13:10:17 2017 +0200 @@ -1,3 +1,11 @@ +2017-04-10 Jiri Vanek <jvanek@redhat.com> + + On windows, shutdown hook added like we do, via lazy initiated OutputController + (which may be swing/awt hidden call (not verified)) causes exception + "can't add shutdown hook, shutdown already in progress" + * netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java: (main) enforced + headless mode, to prevent itw debug console from showing. + 2017-04-06 Jiri Vanek <jvanek@redhat.com> Reproduce and fixed pr3350.
--- a/netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java Thu Apr 06 15:31:12 2017 +0200 +++ b/netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java Mon Apr 10 13:10:17 2017 +0200 @@ -54,6 +54,7 @@ import net.sourceforge.jnlp.OptionsDefinitions; import net.sourceforge.jnlp.config.InfrastructureFileDescriptor; import net.sourceforge.jnlp.config.Setting; +import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.jnlp.runtime.Translator; import net.sourceforge.jnlp.util.docprovider.formatters.formatters.Formatter; import net.sourceforge.jnlp.util.docprovider.formatters.formatters.HtmlFormatter; @@ -396,10 +397,13 @@ } public static void main(String[] args) throws IOException { + // Shutdown hook from OutputController was causing hanging build on Windows. It's not used on headless. + JNLPRuntime.setHeadless(true); + if (args.length == 0) { System.out.println(" * IcedTea-Web self documentation tool list of arguments *"); - System.out.println(" * arument version - last parameter of each command, is used when there is no internal versionknown *"); - System.out.println(" * - is mandatory, but not used if real version do exists *"); + System.out.println(" * argument version - last parameter of each command, is used when there is no internal versionknown *"); + System.out.println(" * - is mandatory, but not used if real version do exists *"); System.out.println(" * argument expand - one before last argument, false/true - is used to not/expand variables *"); System.out.println(" * -------------------- *"); System.out.println("all expand version - will generate all reports in theirs defaults into current directory");