/hg/icedtea6: Centralized and increased timeouts to give slow-lo...

[Andrew John Hughes]

On 23 February 2010 15:20, Deepak Bhole <dbhole at redhat.com> wrote:
> * Andrew John Hughes <gnu_andrew at member.fsf.org> [2010-02-23 07:01]:
>> On 22 February 2010 21:54,  <dbhole at icedtea.classpath.org> wrote:
>> > changeset b30c8301d479 in /hg/icedtea6
>> > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b30c8301d479
>> > author: Deepak Bhole <dbhole at redhat.com>
>> > date: Mon Feb 22 16:54:32 2010 -0500
>> >
>> >        Centralized and increased timeouts to give slow-loading applets
>> >        enough time to load.
>> >
>> >
>> > diffstat:
>> >
>> > 2 files changed, 11 insertions(+), 4 deletions(-)
>> > ChangeLog                                                |    5 +++++
>> > plugin/icedteanp/java/sun/applet/PluginAppletViewer.java |   10 ++++++----
>> >
>> > diffs (60 lines):
>> >
>> > diff -r 6571641c60ab -r b30c8301d479 ChangeLog
>> > --- a/ChangeLog Sun Feb 21 16:24:11 2010 +0100
>> > +++ b/ChangeLog Mon Feb 22 16:54:32 2010 -0500
>> > @@ -1,3 +1,8 @@ 2010-02-21  Xerxes Rånby  <xerxes at zafen
>> > +2010-02-22  Deepak Bhole <dbhole at redhat.com>
>> > +
>> > +       * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
>> > +       and increased timeouts to give slow-loading applets enough time to load.
>> > +
>> >  2010-02-21  Xerxes Rånby  <xerxes at zafena.se>
>> >
>> >        * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
>> > diff -r 6571641c60ab -r b30c8301d479 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
>> > --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java  Sun Feb 21 16:24:11 2010 +0100
>> > +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java  Mon Feb 22 16:54:32 2010 -0500
>> > @@ -177,7 +177,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
>> >          Applet a;
>> >
>> >          // Wait for panel to come alive
>> > -         int maxWait = 5000; // wait 5 seconds max for panel to come alive
>> > +         int maxWait = PluginAppletViewer.APPLET_TIMEOUT; // wait for panel to come alive
>> >          int wait = 0;
>> >          while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
>> >               try {
>> > @@ -368,6 +368,8 @@ import com.sun.jndi.toolkit.url.UrlUtil;
>> >      private long handle = 0;
>> >      private WindowListener windowEventListener = null;
>> >      private AppletEventListener appletEventListener = null;
>> > +
>> > +     public static final int APPLET_TIMEOUT = 60000;
>> >
>> >      /**
>> >       * Null constructor to allow instantiation via newInstance()
>> > @@ -616,7 +618,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
>> >                  if (message.startsWith("handle")) {
>> >
>> >                      PluginDebug.debug("handle command waiting for applet to complete loading.");
>> > -                     int maxWait = 10000; // wait 10 seconds max for applet to fully load
>> > +                     int maxWait = APPLET_TIMEOUT; // wait for applet to fully load
>> >                      int wait = 0;
>> >                      while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) &&
>> >                              (wait < maxWait)) {
>> > @@ -663,7 +665,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
>> >          if (message.startsWith("width")) {
>> >
>> >              // Wait for panel to come alive
>> > -             int maxWait = 5000; // wait 5 seconds max for panel to come alive
>> > +             int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
>> >              int wait = 0;
>> >              while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) && wait < maxWait) {
>> >                   try {
>> > @@ -724,7 +726,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
>> >              Object o;
>> >
>> >              // Wait for panel to come alive
>> > -             int maxWait = 5000; // wait 5 seconds max for panel to come alive
>> > +             int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
>> >              int wait = 0;
>> >              while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
>> >                   try {
>> >
>>
>> If there are plugin fixes you want in a 1.7.1 / gold plugin release,
>> then you need to be pushing them to the branch too.
>
>
> Yeah I know. There are a couple more in the pipeline I want in and I
> will do a mass merge of the plugin code into 1.7 then.
>
> Cheers,
> Deepak
>
>> --
>> Andrew :-)
>>
>> Free Java Software Engineer
>> Red Hat, Inc. (http://www.redhat.com)
>>
>> Support Free Java!
>> Contribute to GNU Classpath and the OpenJDK
>> http://www.gnu.org/software/classpath
>> http://openjdk.java.net
>>
>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
>> Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
>

When you do, can you make sure you port the changesets i.e. hg export
-R <path to head> <id> | hg import - in the 1.7 checkout.  It's easier
to track if they look the same.

It would be much easier if it wasn't for that damn ChangeLog!

Cheers,
-- 
Andrew :-)

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

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8