# HG changeset patch
# User Jiri Vanek <jvanek@redhat.com>
# Date 1416941415 -3600
# Node ID 799b37e9186ae88ec60b11087f5bce78350875e8
# Parent  d4a7897997fd94631e2517a12890bdf65dc5b74b
* netx/net/sourceforge/jnlp/Launcher.java: (fromUrl) file from href get	substituted codebase from previous one if it is missing in new one.

diff -r d4a7897997fd -r 799b37e9186a ChangeLog
--- 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
diff -r d4a7897997fd -r 799b37e9186a netx/net/sourceforge/jnlp/Launcher.java
--- 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) {