aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--NEWS1
-rw-r--r--netx/net/sourceforge/jnlp/PluginParameters.java4
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 65ec026..bd8df2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-10 Saad Mohammad <smohammad@redhat.com>
+
+ Fix PR1189: Icedtea-plugin requires code attribute when using jnlp_href.
+ * netx/net/sourceforge/jnlp/PluginParameters.java (PluginParameters):
+ Updated if condition to prevent PluginParameterException from being thrown
+ if applet tag contains jnlp_href but is missing code/object parameters.
+
2012-12-06 Adam Domurad <adomurad@redhat.com>
* Makefile.am: Fix targets stamps/netx-unit-tests-compile.stamp and
diff --git a/NEWS b/NEWS
index 91c2265..b5a35d2 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ New in release 1.4 (2012-XX-XX):
- PR1106: Buffer overflow in plugin table-
- PR1166: Embedded JNLP File is not supported in applet tag
- PR1217: Add command line arguments for plugins
+ - PR1189: Icedtea-plugin requires code attribute when using jnlp_href
* Common
- PR1049: Extension jnlp's signed jar with the content of only META-INF/* is considered
- PR955: regression: SweetHome3D fails to run
diff --git a/netx/net/sourceforge/jnlp/PluginParameters.java b/netx/net/sourceforge/jnlp/PluginParameters.java
index 6f0152e..06b1b3c 100644
--- a/netx/net/sourceforge/jnlp/PluginParameters.java
+++ b/netx/net/sourceforge/jnlp/PluginParameters.java
@@ -54,7 +54,9 @@ public class PluginParameters {
this.parameters = createParameterTable(params);
if (this.parameters.get("code") == null
- && this.parameters.get("object") == null) {
+ && this.parameters.get("object") == null
+ //If code/object parameters are missing, we can still determine the main-class name from the jnlp file passed using jnlp_href
+ && this.parameters.get("jnlp_href") == null) {
throw new PluginParameterException(R("BNoCodeOrObjectApplet"));
}
}