diff options
Diffstat (limited to 'libjava/java/net')
| -rw-r--r-- | libjava/java/net/DatagramSocket.java | 12 | ||||
| -rw-r--r-- | libjava/java/net/MulticastSocket.java | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/libjava/java/net/DatagramSocket.java b/libjava/java/net/DatagramSocket.java index 4cc8e50f0d5..1d89d688401 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 cedd9c65738..1b7b422e071 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; |
