DatagramSocket.java: Partly merged with classpath.

2003-06-11  Michael Koch  <konqueror@gmx.de>

	* java/net/DatagramSocket.java:
	Partly merged with classpath.

From-SVN: r67755

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 388dd00e2f4b8a15cb7b9c8a3d550971db56731c..845bfbeca84fdc0bfed6247622a3773a70c76251 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-11  Michael Koch  <konqueror@gmx.de>
+
+       * java/net/DatagramSocket.java:
+       Partly merged with classpath.
+
 2003-06-11  Michael Koch  <konqueror@gmx.de>
 
        * java/awt/Frame.java,

diff --git a/libjava/java/net/DatagramSocket.java b/libjava/java/net/DatagramSocket.java
index e21ea44e1b4a9aa526a3502b1c37ed1ab88b7646..57f3da7086288160cf668bd956af702f10b753c3 100644 (file)
--- a/libjava/java/net/DatagramSocket.java
+++ b/libjava/java/net/DatagramSocket.java
@@ -174,11 +174,28 @@ public class DatagramSocket
        }
     impl.create();
 
-
-    impl.bind(port, laddr == null ? InetAddress.ANY_IF : laddr);
+    if (laddr == null)
+      laddr = InetAddress.ANY_IF;
     
-    remoteAddress = null;
-    remotePort = -1;
+    try
+      {
+        impl.bind (port, laddr);
+      }
+    catch (SocketException exception)
+      {
+        impl.close ();
+        throw exception;
+      }
+    catch (RuntimeException exception)
+      {
+        impl.close ();
+        throw exception;
+      }
+    catch (Error error)
+      {
+        impl.close ();
+        throw error;
+      }
   }
 
   /**