[rfc][icedtea-web] PAV - Add missing timeout check

[Deepak Bhole]

* Thomas Meyer <thomas at m3y3r.de> [2012-07-18 18:11]:
> Am Montag, den 16.07.2012, 17:57 -0400 schrieb Danesh Dadachanji:
> > 
> > > Sorry, missed this. Looks fine to me, OK for head.
> > >
> > 
> > Needs a ChangeLog entry though, couldn't see one anywhere. =)
> 
> New patch attached:
> 
> I removed the panelLock.unlock() as it's get's called in the finally
> block anyway.
> 

One very minor thing .. the f for "fix" should be capital in the
changelog :)

Otherwise okay for HEAD and 1.3

Thanks!
Deepak

> ChangeLog:
> 
> 2012-07-18  Thomas Meyer  <thomas at m3y3r.de>
> 
> 	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (handleMessage):
> 	fix possible endless loop while waiting for the applet object instance to 
> 	get created.
> > 
> > Cheers,
> > Danesh
> > 
> 
> 
> 

> # HG changeset patch
> # Parent 01544fb823842910b062b5b05b6872812ceecb98
> 
> diff -r 01544fb82384 ChangeLog
> --- a/ChangeLog	Wed Jul 11 16:18:58 2012 +0200
> +++ b/ChangeLog	Thu Jul 19 00:02:50 2012 +0200
> @@ -1,3 +1,9 @@
> +2012-07-18  Thomas Meyer  <thomas at m3y3r.de>
> +
> +	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (handleMessage):
> +	fix possible endless loop while waiting for the applet object instance to 
> +	get created.
> +
>  2012-07-11  Jiri Vanek  <jvanek at redhat.com>
>  
>  	try to close browser before kill it
> diff -r 01544fb82384 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
> --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Wed Jul 11 16:18:58 2012 +0200
> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Thu Jul 19 00:02:50 2012 +0200
> @@ -745,9 +745,18 @@
>              long maxTimeToSleep = APPLET_TIMEOUT;
>              panelLock.lock();
>              try {
> -                while (panel == null || !panel.isAlive())
> +                while (panel == null || !panel.isAlive()) {
>                      maxTimeToSleep -= waitTillTimeout(panelLock, panelLive,
>                                                        maxTimeToSleep);
> +
> +                    /* we already waited till timeout, give up here directly,
> +                     *  instead of waiting 180s again in below waitForAppletInit()
> +                     */
> +                    if(maxTimeToSleep < 0) {
> +                        streamhandler.write("instance " + identifier + " reference " + -1 + " fatalError: " + "Initialization timed out");
> +                        return;
> +                    }
> +                }
>              }
>              finally {
>                  panelLock.unlock();