Mercurial > hg > release > icedtea6-1.7

changeset 1979:c18673769bc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 25 Aug 2010 17:11:27 +0100
parents 4ed5f5c9cba8 (current diff) 819f823a4c6f (diff)
children e508d944ca9d
files ChangeLog NEWS
diffstat 5 files changed, 27 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Aug 12 23:54:09 2010 +0100
+++ b/ChangeLog	Wed Aug 25 17:11:27 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,23 @@
 	* 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 for this fix.
+	* rt/net/sourceforge/jnlp/Parser.java: Add 1.6 to supportedVersions.
+
 2010-08-05  Omair Majid  <omajid@redhat.com>
 
 	* NEWS: Update with netx bugfix.
--- a/NEWS	Thu Aug 12 23:54:09 2010 +0100
+++ b/NEWS	Wed Aug 25 17:11:27 2010 +0100
@@ -7,6 +7,8 @@
 * NetX
  - Fix browser command in BasicService.showDocument(URL)
  - Run programs that inherit main(String[]) in their main-class
+ - Work with JNLP files that use spec version 1.6
+ - RH601281: Possible NullPointerException in splash screen code
 
 New in release 1.7.4 (2010-07-28):
 
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Thu Aug 12 23:54:09 2010 +0100
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Wed Aug 25 17:11:27 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();
-                     }
                  }
              }
          }
--- a/rt/net/sourceforge/jnlp/JNLPSplashScreen.java	Thu Aug 12 23:54:09 2010 +0100
+++ b/rt/net/sourceforge/jnlp/JNLPSplashScreen.java	Wed Aug 25 17:11:27 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/rt/net/sourceforge/jnlp/Parser.java	Thu Aug 12 23:54:09 2010 +0100
+++ b/rt/net/sourceforge/jnlp/Parser.java	Wed Aug 25 17:11:27 2010 +0100
@@ -72,7 +72,7 @@
 
 
     /** the supported JNLP file versions */
-    private static Version supportedVersions = new Version("1.0 1.5 6.0");
+    private static Version supportedVersions = new Version("1.0 1.5 1.6 6.0");
 
     // fix: some descriptors need to use the jnlp file at a later
     // date and having file ref lets us pass it to their