I'm not checking this in quite yet.
This re-merges NetworkInterface and MulticastSocket.
For MulticastSocket the only divergence was that we commented out a
call to a method in NetworkInterface that we didn't provide.
I don't really like the new VMNetworkInterface -- I think that in
general if a class refers to specific fields in its VM counterpart,
then probably those fields just belong in the class itself in the
first place. But, never mind, I updated ours to fit anyway.
I also updated the Windows native code for this patch, since the
change is just replacing 'new NetworkInterface' with 'new
VMNetworkInterface'. However, I don't have a way to build this and I
would appreciate it if someone could try it for me.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* sources.am, Makefile.in: Rebuilt.
* java/net/NetworkInterface.java: Removed override.
* java/net/MulticastSocket.java: Likewise.
* java/net/VMNetworkInterface.java (name, addresses): New fields.
(VMNetworkInterface): New constructors.
(getVMInterfaces): New method.
Removed static initializer.
(getInterfaces): Genericized.
* java/net/natVMNetworkInterfacePosix.cc (getInterfaces): Create a
VMNetworkInterface.
* java/net/natVMNetworkInterfaceWin32.cc (getInterfaces): Create a
VMNetworkInterface.