/hg/icedtea-web: PR1189: Icedtea-plugin requires code attribute ...
smohammad at icedtea.classpath.org
smohammad at icedtea.classpath.org
Mon Dec 10 14:36:25 PST 2012
changeset c6c31f239613 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c6c31f239613
author: Saad Mohammad <smohammad at redhat.com>
date: Mon Dec 10 17:35:50 2012 -0500
PR1189: Icedtea-plugin requires code attribute when using jnlp_href
diffstat:
ChangeLog | 7 +++++++
NEWS | 1 +
netx/net/sourceforge/jnlp/PluginParameters.java | 4 +++-
3 files changed, 11 insertions(+), 1 deletions(-)
diffs (39 lines):
diff -r dc00e6d5a2f9 -r c6c31f239613 ChangeLog
--- a/ChangeLog Thu Dec 06 10:04:06 2012 -0500
+++ b/ChangeLog Mon Dec 10 17:35:50 2012 -0500
@@ -1,3 +1,10 @@
+2012-12-10 Saad Mohammad <smohammad at 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 at redhat.com>
* Makefile.am: Fix targets stamps/netx-unit-tests-compile.stamp and
diff -r dc00e6d5a2f9 -r c6c31f239613 NEWS
--- a/NEWS Thu Dec 06 10:04:06 2012 -0500
+++ b/NEWS Mon Dec 10 17:35:50 2012 -0500
@@ -20,6 +20,7 @@
- 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 -r dc00e6d5a2f9 -r c6c31f239613 netx/net/sourceforge/jnlp/PluginParameters.java
--- a/netx/net/sourceforge/jnlp/PluginParameters.java Thu Dec 06 10:04:06 2012 -0500
+++ b/netx/net/sourceforge/jnlp/PluginParameters.java Mon Dec 10 17:35:50 2012 -0500
@@ -54,7 +54,9 @@
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"));
}
}
More information about the distro-pkg-dev
mailing list