[RFC][IcedTea-Web]: Fix for PR464

[Dr Andrew John Hughes]

On 13:34 Wed 08 Jun     , Andrew Su wrote:
> 
> 
> ----- Original Message -----
> > From: "Dr Andrew John Hughes" <ahughes at redhat.com>
> > To: "Andrew Su" <asu at redhat.com>
> > Cc: "distro-pkg-dev" <distro-pkg-dev at openjdk.java.net>
> > Sent: Wednesday, June 8, 2011 12:21:28 PM
> > Subject: Re: [RFC][IcedTea-Web]: Fix for PR464
> > On 10:17 Wed 08 Jun , Andrew Su wrote:
> > >
> > >
> -- snip --
> > >
> > > The reason for the change is the following snippet:
> > >
> > > - JNLPFile jnlpFile = new JNLPFile(jnlp);
> > > + JNLPFile jnlpFile = new JNLPFile(jnlp, null, false,
> > > JNLPRuntime.getDefaultUpdatePolicy(), this.codeBase);
> > >                  Map<String, String> jnlpParams =
> > >                  jnlpFile.getApplet().getParameters();
> > >
> > >                  // Change the parameter name to lowercase to follow
> > >                  conventions.
> > >                  for (Map.Entry<String, String> entry :
> > >                  jnlpParams.entrySet()) {
> > > - atts.put(entry.getKey().toLowerCase(), entry.getValue());
> > > + this.atts.put(entry.getKey().toLowerCase(), entry.getValue());
> > >                  }
> > > + JARDesc[] jarDescs = jnlpFile.getResources().getJARs();
> > > + for (JARDesc jarDesc : jarDescs) {
> > > + String fileName = jarDesc.getLocation().toExternalForm();
> > > + this.jars.add(fileName);
> > > + }
> > >              } catch (MalformedURLException e) {
> > >
> > > Here we are adding the names to 'jars' as well. Which means that
> > > 'jars' if left as String[] will mean we will have to extend the size
> > > if there are any items in the snippet you posted. Also we would need
> > > to go through the items, to avoid having same items added more than
> > > once. (since the site dev, may choose to specify it in both the JNLP
> > > file and as a parameter.).
> > >
> > > Cheers,
> > >  Andrew
> > 
> > Ok, so let's do the HashSet change in one patch, and then apply the
> > new support on top of it.
> > It makes the changes clearer.
> 
> Sure thing, here's the changes split in two.
> 
> Is this ok for HEAD now?
> 
> Cheers,
>   Andrew
> 

Yep, looks good to me.  Thanks.
-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37