Mercurial > hg > release > icedtea6-1.8
changeset 2081:01d87c70057a
Merge
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 25 Aug 2010 17:13:03 +0100 |
| parents | 8dbe3de24290 (current diff) 3ec77b8b0bcd (diff) |
| children | 73442a614b23 |
| files | ChangeLog NEWS |
| diffstat | 4 files changed, 20 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Aug 13 00:35:50 2010 +0100 +++ b/ChangeLog Wed Aug 25 17:13:03 2010 +0100 @@ -9,6 +9,7 @@ 2010-08-02 Andrew John Hughes <ahughes@redhat.com> + Fixes http://bugs.gentoo.org/show_bug.cgi?id=266295 * Makefile.am: Add patch below. * patches/fonts-gentoo.patch: Add a font configuration for Gentoo @@ -36,6 +37,18 @@ * patches/no-test_gamma.patch: test_gamma patch for PaX-enabled kernels. +2010-08-24 Omair Majid <omajid@redhat.com> + + Fixes rhbz601281 + * NEWS: Update with this fix. + * netx/net/sourceforge/jnlp/JNLPSplashScreen.java + (setSplashImageURL): Check for possible null. + +2010-08-23 Andrew Su <asu@redhat.com> + + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (parse): Removed parsing for unknown <app> tag. + 2010-08-09 Omair Majid <omajid@redhat.com> * NEWS: Update with support for spec 1.6
--- a/NEWS Fri Aug 13 00:35:50 2010 +0100 +++ b/NEWS Wed Aug 25 17:13:03 2010 +0100 @@ -8,6 +8,7 @@ - Fix browser command in BasicService.showDocument(URL) - Run programs that inherit main(String[]) in their main-class - Run JNLP files that use 1.6 as the spec version + - RH601281: Possible NullPointerException in splash screen code New in release 1.8.1 (2010-07-28):
--- a/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Fri Aug 13 00:35:50 2010 +0100 +++ b/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Wed Aug 25 17:13:03 2010 +0100 @@ -44,6 +44,12 @@ try { splashImage = ImageIO.read(resourceTracker .getCacheFile(splashImageUrl)); + if (splashImage == null) { + if (JNLPRuntime.isDebug()) { + System.err.println("Error loading splash image: " + url); + } + return; + } } catch (IOException e) { if (JNLPRuntime.isDebug()) { System.err.println("Error loading splash image: " + url);
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri Aug 13 00:35:50 2010 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed Aug 25 17:13:03 2010 +0100 @@ -2124,40 +2124,6 @@ atts.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1))); } } - else if (nm.equalsIgnoreCase("app")) { - statusMsgStream.println(appNotLongerSupportedWarning); - Hashtable atts2 = scanTag(in); - nm = (String)atts2.get("class"); - if (nm != null) { - atts2.remove("class"); - atts2.put("code", nm + ".class"); - } - nm = (String)atts2.get("src"); - if (nm != null) { - atts2.remove("src"); - atts2.put("codebase", nm); - } - if (atts2.get("width") == null || !isInt(atts2.get("width"))) { - atts2.put("width", "1000"); - atts2.put("widthPercentage", 100); - } else if (((String) atts.get("width")).endsWith("%")) { - String w = (String) atts.get("width"); - atts2.put("width", "100"); - atts2.put("widthPercentage", Integer.parseInt(w.substring(0, w.length() -1))); - } - - if (atts2.get("height") == null || !isInt(atts2.get("height"))) { - atts2.put("height", "1000"); - atts2.put("heightPercentage", 100); - } else if (((String) atts.get("height")).endsWith("%")) { - String h = (String) atts.get("height"); - atts2.put("height", "100"); - atts2.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1))); - } - - printTag(statusMsgStream, atts2); - statusMsgStream.println(); - } } } }