From: Michael Koch <konqueror@gmx.de>
Date: Wed, 11 Jun 2003 10:38:38 +0000 (+0000)
Subject: DatagramSocket.java: Partly merged with classpath.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=39b3ceceeee9941cf32a103b459e6592c122860b;p=gcc.git

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 388dd00e2f4..845bfbeca84 100644
--- 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 e21ea44e1b4..57f3da70862 100644
--- 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;
+      }
   }
 
   /**