From 65f070242b4206f88edf3c53000520f3f5c0224a Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Fri, 19 Sep 2003 07:24:59 +0000 Subject: DatagramSocket.java (getLocalAddress): Renamed result variable to localAddr. 2003-09-19 Michael Koch * java/net/DatagramSocket.java (getLocalAddress): Renamed result variable to localAddr. * java/net/MulticastSocket.java: No need to import gnu.java.net.PlainDatagramSocketImpl. From-SVN: r71561 --- libjava/java/net/DatagramSocket.java | 12 ++++++------ libjava/java/net/MulticastSocket.java | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/net/DatagramSocket.java b/libjava/java/net/DatagramSocket.java index 4cc8e50..1d89d68 100644 --- a/libjava/java/net/DatagramSocket.java +++ b/libjava/java/net/DatagramSocket.java @@ -266,26 +266,26 @@ public class DatagramSocket || closed) return null; - InetAddress result; + InetAddress localAddr; try { - result = (InetAddress) impl.getOption (SocketOptions.SO_BINDADDR); + localAddr = (InetAddress) impl.getOption (SocketOptions.SO_BINDADDR); SecurityManager s = System.getSecurityManager(); if (s != null) - s.checkConnect (result.getHostName(), -1); + s.checkConnect (localAddr.getHostName(), -1); } catch (SecurityException e) { - result = InetAddress.ANY_IF; + localAddr = InetAddress.ANY_IF; } catch (SocketException e) { - result = InetAddress.ANY_IF; + return null; } - return result; + return localAddr; } /** diff --git a/libjava/java/net/MulticastSocket.java b/libjava/java/net/MulticastSocket.java index cedd9c6..1b7b422 100644 --- a/libjava/java/net/MulticastSocket.java +++ b/libjava/java/net/MulticastSocket.java @@ -36,10 +36,8 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ - package java.net; -import gnu.java.net.PlainDatagramSocketImpl; import java.io.IOException; import java.util.Enumeration; -- cgit v1.1