DatagramSocket.java (getLocalAddress): Renamed result variable to localAddr.

2003-09-19  Michael Koch  <konqueror@gmx.de>

	* 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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0fe4575d1a242ce3131e24a98a59561e7704d3e3..5902d060c7e2b9f5bda4e18e2c3cc612a0964c20 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-19  Michael Koch  <konqueror@gmx.de>
+
+       * java/net/DatagramSocket.java (getLocalAddress):
+       Renamed result variable to localAddr.
+       * java/net/MulticastSocket.java:
+       No need to import gnu.java.net.PlainDatagramSocketImpl.
+
 2003-09-18  Sascha Brawer  <brawer@dandelis.ch>
 
        * java/awt/Toolkit.java (getSystemEventQueue, getSystemEventQueueImpl):

diff --git a/libjava/java/net/DatagramSocket.java b/libjava/java/net/DatagramSocket.java
index 4cc8e50f0d5314d0fe24efce2dbc5058e19e7c73..1d89d6884019ba88e94560233f22f6c82d818525 100644 (file)
--- 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 cedd9c6573897b5a00df48d0530aedef8434332c..1b7b422e07155c7d21af2a9575bfb2e6956f1442 100644 (file)
--- 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;