Re: FYI: Win32 InetAddress fix

[Marco Trudel <mtrudel@gmx.ch>]

Gary Benson wrote:
> Marco Trudel wrote:
>
> <bigsnip>
> 
> This commit should fix the build failure and the NullPointerException.
> 
> FWIW what happened with all the different patches was that I wrote
> http://gcc.gnu.org/ml/java-patches/2006-q3/msg00386.html thinking it
> would be a stepping stone to a solution, but inbetween me posting it
> to the list and Tom saying to check it in I realised that all that
> code would be trashed anyway so I didn't bother committing it.
> 
> As far as the other patches go the only outstanding one is
> http://gcc.gnu.org/ml/java-patches/2006-q3/msg00486.html (though I
> need to remake it because of this commit).  That can't be committed
> before the branch because the Posix part has a lot of conditional
> stuff which might be broken.  I'll be committing that just as soon
> as we branch.

When will we branch? Few days? Weeks? Fix date?
Are we talking about the 4.2 release?

Marco

> Cheers,
> Gary
> 
> 
> ------------------------------------------------------------------------
> 
> Index: ChangeLog
> ===================================================================
> --- ChangeLog	(revision 117367)
> +++ ChangeLog	(working copy)
> @@ -1,3 +1,9 @@
> +2006-10-02  Gary Benson  <gbenson@redhat.com>
> +
> +	* java/net/InetAddress.java
> +	(checkConnect): Reinstated.
> +	(loopbackAddress): Ensure initialized from non-null object.
> +
>  2006-09-30  Keith Seitz  <keiths@redhat.com>
>  
>  	* include/java-interp.h (prepared): Change type to pc_t.
> Index: java/net/InetAddress.java
> ===================================================================
> --- java/net/InetAddress.java	(revision 117367)
> +++ java/net/InetAddress.java	(working copy)
> @@ -101,6 +101,8 @@
>      try
>        {
>  	LOCALHOST = getByAddress("localhost", new byte[] {127, 0, 0, 1});
> +	// Some soon-to-be-removed native code synchronizes on this.
> +	loopbackAddress = LOCALHOST;
>        }
>      catch (UnknownHostException e)
>        {
> @@ -793,7 +795,7 @@
>    static native String getLocalHostname();
>  
>    // Some soon-to-be-removed native code synchronizes on this.
> -  static InetAddress loopbackAddress = LOCALHOST;
> +  static InetAddress loopbackAddress;
>    
>    // Some soon-to-be-removed code uses this old and broken method.
>    InetAddress(byte[] ipaddr, String hostname)
> @@ -805,9 +807,13 @@
>        family = getFamily(ipaddr);
>    }
>  
> -  // Some soon-to-be-removed native code uses this old method.
> +  // Some soon-to-be-removed native code uses these old methods.
>    private static InetAddress[] allocArray (int count)
>    {
>      return new InetAddress [count];
>    }  
> +  private static SecurityException checkConnect (String hostname)
> +  {
> +    return null;
> +  }
>  }