Mercurial > hg > release > icedtea-web-1.5

changeset 1033:799b37e9186a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* netx/net/sourceforge/jnlp/Launcher.java: (fromUrl) file from href get substituted codebase from previous one if it is missing in new one.
author Jiri Vanek <jvanek@redhat.com>
date Tue, 25 Nov 2014 19:50:15 +0100
parents d4a7897997fd
children 052c53ca776d
files ChangeLog netx/net/sourceforge/jnlp/Launcher.java
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Nov 25 11:15:25 2014 -0500
+++ b/ChangeLog	Tue Nov 25 19:50:15 2014 +0100
@@ -1,3 +1,8 @@
+2014-11-25  Jiri Vanek  <jvanek@redhat.com>
+
+	* netx/net/sourceforge/jnlp/Launcher.java: (fromUrl) file from href get
+	substituted codebase from previous one if it is missing in new one.
+
 2014-11-25  Jie Kang  <jkang@redhat.com>
 
 	Fixed newly failing unit test: JavaConsoleTest:CreatePluginHeaderTestNotOK
--- a/netx/net/sourceforge/jnlp/Launcher.java	Tue Nov 25 11:15:25 2014 -0500
+++ b/netx/net/sourceforge/jnlp/Launcher.java	Tue Nov 25 19:50:15 2014 +0100
@@ -473,7 +473,12 @@
             }
 
             if (isLocal && haveHref) {
-                file = new JNLPFile(file.getSourceLocation(), parserSettings);
+                JNLPFile fileFromHref = new JNLPFile(file.getSourceLocation(), parserSettings);
+                if (fileFromHref.getCodeBase() == null) {
+                    fileFromHref.codeBase = file.getCodeBase();
+                }
+                file = fileFromHref;
+
             }
             return file;
         } catch (Exception ex) {