/hg/icedtea-web: Added comments, clarified a previous changelog ...

[dlila at icedtea.classpath.org]

changeset 5bc80c9e11c7 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=5bc80c9e11c7
author: Denis Lila <dlila at redhat.com>
date: Mon Mar 07 09:50:14 2011 -0500

	Added comments, clarified a previous changelog entry.


diffstat:

 ChangeLog                                            |  13 ++++++++++++-
 netx/net/sourceforge/jnlp/JNLPFile.java              |   6 ++++--
 netx/net/sourceforge/jnlp/PluginBridge.java          |   3 +++
 netx/net/sourceforge/jnlp/cache/ResourceTracker.java |   6 +++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diffs (86 lines):

diff -r f1a5201c6b04 -r 5bc80c9e11c7 ChangeLog
--- a/ChangeLog	Fri Mar 04 18:16:07 2011 -0500
+++ b/ChangeLog	Mon Mar 07 09:50:14 2011 -0500
@@ -1,3 +1,13 @@
+2011-03-07  Denis Lila  <dlila at redhat.com>
+
+	* netx/net/sourceforge/jnlp/JNLPFile.java:
+	(getResourcesDescs): added comment.
+	(getDownloadOptionsForJar): removed commented out code.
+	* netx/net/sourceforge/jnlp/PluginBridge.java
+	(getResourcesDescs): added comment.
+	* netx/net/sourceforge/jnlp/cache/ResourceTracker.java
+	(downloadResource): added comment.
+
 2011-03-04  Denis Lila  <dlila at redhat.com>
 
 	* netx/net/sourceforge/jnlp/JNLPFile.java:
@@ -17,7 +27,8 @@
 	(downloadResource): changed the order in which pack200+gz compression
 	and gzip compression are checked.
 	* netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java
-	(getUrl): if usePack now concatenating strings instead of replacing.
+	(getUrl): if usePack is true, append ".pack.gz" to the file name,
+	instead of replacing ".jar" with ".pack.gz".
 
 2011-03-04  Deepak Bhole <dbhole at redhat.com>
 
diff -r f1a5201c6b04 -r 5bc80c9e11c7 netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.java	Fri Mar 04 18:16:07 2011 -0500
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java	Mon Mar 07 09:50:14 2011 -0500
@@ -395,6 +395,8 @@
      * Returns the resources section of the JNLP file as viewed
      * through the default locale and the os.name and os.arch
      * properties.
+     * XXX: Before overriding this method or changing its implementation,
+     * read the comment in JNLPFile.getDownloadOptionsForJar(JARDesc).
      */
     public ResourcesDesc[] getResourcesDescs() {
         return getResourcesDescs(defaultLocale, defaultOS, defaultArch);
@@ -649,7 +651,7 @@
      * XXX: this method does a "==" comparison between the input JARDesc and
      * jars it finds through getResourcesDescs(). If ever the implementation
      * of that function should change to return copies of JARDescs objects,
-     * then the "jar == aJar" comparison below should change accordingly. 
+     * then the "jar == aJar" comparison below should change accordingly.
      * @param jar: the jar whose download options to get.
      * @return the download options.
      */
@@ -660,7 +662,7 @@
         for (ResourcesDesc desc: descs) {
             JARDesc[] jars = desc.getJARs();
             for (JARDesc aJar: jars) {
-                if (jar == aJar/*jar.getLocation().equals(aJar.getLocation())*/) {
+                if (jar == aJar) {
                     if (Boolean.valueOf(desc.getPropertiesMap().get("jnlp.packEnabled"))) {
                         usePack = true;
                     }
diff -r f1a5201c6b04 -r 5bc80c9e11c7 netx/net/sourceforge/jnlp/PluginBridge.java
--- a/netx/net/sourceforge/jnlp/PluginBridge.java	Fri Mar 04 18:16:07 2011 -0500
+++ b/netx/net/sourceforge/jnlp/PluginBridge.java	Mon Mar 07 09:50:14 2011 -0500
@@ -154,6 +154,9 @@
         }
     }
 
+    /**
+     * {@inheritdoc }
+     */
     @Override
     public DownloadOptions getDownloadOptionsForJar(JARDesc jar) {
         return new DownloadOptions(usePack, useVersion);
diff -r f1a5201c6b04 -r 5bc80c9e11c7 netx/net/sourceforge/jnlp/cache/ResourceTracker.java
--- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java	Fri Mar 04 18:16:07 2011 -0500
+++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java	Mon Mar 07 09:50:14 2011 -0500
@@ -656,7 +656,11 @@
             boolean packgz = "pack200-gzip".equals(contentEncoding) ||
                                 realLocation.getPath().endsWith(".pack.gz");
             boolean gzip = "gzip".equals(contentEncoding);
-            
+
+            // It's important to check packgz first. If a stream is both
+            // pack200 and gz encoded, then con.getContentEncoding() could
+            // return ".gz", so if we check gzip first, we would end up
+            // treating a pack200 file as a jar file.
             if (packgz) {
                 downloadLocation = new URL(downloadLocation.toString() + ".pack.gz");
             } else if (gzip) {