/hg/icedtea-web: JnlpBoot and XBasicService are called with exit...

[jvanek at icedtea.classpath.org]

changeset c09f70284a5f in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c09f70284a5f
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Jun 18 17:56:22 2015 +0200

	JnlpBoot and XBasicService are called with exitOnException true now. All other then boolean constructor of Launcher made private. True/False enforced and reconsidered

	* netx/net/sourceforge/jnlp/Launcher.java: All other then boolean constructor of Launcher made private.
	* netx/net/sourceforge/jnlp/runtime/JnlpBoot.java: (run) new Launcher called with true rather then false
	* netx/net/sourceforge/jnlp/services/XBasicService.java: (lunchUrl) same


diffstat:

 ChangeLog                                             |  10 ++++++++++
 netx/net/sourceforge/jnlp/Launcher.java               |   6 +++---
 netx/net/sourceforge/jnlp/runtime/JnlpBoot.java       |   2 +-
 netx/net/sourceforge/jnlp/services/XBasicService.java |   2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diffs (71 lines):

diff -r 7e1e9ab4824d -r c09f70284a5f ChangeLog
--- a/ChangeLog	Thu Jun 18 12:29:34 2015 +0200
+++ b/ChangeLog	Thu Jun 18 17:56:22 2015 +0200
@@ -1,3 +1,13 @@
+2015-06-18  Jiri Vanek  <jvanek at redhat.com>
+
+	JnlpBoot and XBasicService are called with exitOnException true now.
+	All other then boolean constructor of Launcher made private. True/False enforced and reconsidered
+	* netx/net/sourceforge/jnlp/Launcher.java: All other then boolean constructor
+	of Launcher made private.
+	* netx/net/sourceforge/jnlp/runtime/JnlpBoot.java: (run) new Launcher called with
+	true rather then false
+	* netx/net/sourceforge/jnlp/services/XBasicService.java: (lunchUrl) same
+
 2015-06-18  Jiri Vanek  <jvanek at redhat.com>
 
 	All dialogs are able to accept answer from standard input and thus works in headless mode
diff -r 7e1e9ab4824d -r c09f70284a5f netx/net/sourceforge/jnlp/Launcher.java
--- a/netx/net/sourceforge/jnlp/Launcher.java	Thu Jun 18 12:29:34 2015 +0200
+++ b/netx/net/sourceforge/jnlp/Launcher.java	Thu Jun 18 17:56:22 2015 +0200
@@ -88,7 +88,7 @@
      * Create a launcher with the runtime's default update policy
      * and launch handler.
      */
-    public Launcher() {
+    private Launcher() {
         this(null, null);
 
         if (handler == null) {
@@ -118,7 +118,7 @@
      *
      * @param handler the handler to use or null for no handler.
      */
-    public Launcher(LaunchHandler handler) {
+    private Launcher(LaunchHandler handler) {
         this(handler, null);
     }
 
@@ -129,7 +129,7 @@
      * @param handler the handler to use or null for no handler.
      * @param policy the update policy to use or null for default policy.
      */
-    public Launcher(LaunchHandler handler, UpdatePolicy policy) {
+    private Launcher(LaunchHandler handler, UpdatePolicy policy) {
         if (policy == null)
             policy = JNLPRuntime.getDefaultUpdatePolicy();
 
diff -r 7e1e9ab4824d -r c09f70284a5f netx/net/sourceforge/jnlp/runtime/JnlpBoot.java
--- a/netx/net/sourceforge/jnlp/runtime/JnlpBoot.java	Thu Jun 18 12:29:34 2015 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/JnlpBoot.java	Thu Jun 18 17:56:22 2015 +0200
@@ -61,7 +61,7 @@
         }
         try {
             OutputController.getLogger().log("Proceeding with jnlp");
-            Launcher launcher = new Launcher(false);
+            Launcher launcher = new Launcher(true);
             launcher.setParserSettings(settings);
             launcher.setInformationToMerge(extra);
             launcher.launch(Boot.getFileLocation());
diff -r 7e1e9ab4824d -r c09f70284a5f netx/net/sourceforge/jnlp/services/XBasicService.java
--- a/netx/net/sourceforge/jnlp/services/XBasicService.java	Thu Jun 18 12:29:34 2015 +0200
+++ b/netx/net/sourceforge/jnlp/services/XBasicService.java	Thu Jun 18 17:56:22 2015 +0200
@@ -166,7 +166,7 @@
 
         if (url.toString().endsWith(".jnlp")) {
             try {
-                new Launcher().launchExternal(url);
+                new Launcher(false).launchExternal(url);
                 return true;
             } catch (Exception ex) {
                 return false;