Update to OpenJDK 6 b22.

1 files changed, 18 insertions, 10 deletions

diff --git a/openjdk/sun/nio/ch/DatagramChannelImpl.java b/openjdk/sun/nio/ch/DatagramChannelImpl.java
index e8f956ab..1f1707a3 100644
--- a/openjdk/sun/nio/ch/DatagramChannelImpl.java
+++ b/openjdk/sun/nio/ch/DatagramChannelImpl.java
@@ -32,6 +32,7 @@ import java.nio.ByteBuffer;
 import java.nio.channels.*;
 import java.nio.channels.spi.*;
 import java.lang.ref.SoftReference;
+import sun.net.ResourceManager;
 
 
 /**
@@ -97,16 +98,22 @@ class DatagramChannelImpl
         throws IOException
     {
         super(sp);
-        this.fd = Net.socket(false);
-        this.state = ST_UNCONNECTED;
-        try
-        {
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            fd.getSocket().IOControl(SIO_UDP_CONNRESET, new byte[] { 0 }, null);
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            throw SocketUtil.convertSocketExceptionToIOException(x);
+        ResourceManager.beforeUdpCreate();
+        try {
+            this.fd = Net.socket(false);
+            this.state = ST_UNCONNECTED;
+            try
+            {
+                if (false) throw new cli.System.Net.Sockets.SocketException();
+                fd.getSocket().IOControl(SIO_UDP_CONNRESET, new byte[] { 0 }, null);
+            }
+            catch (cli.System.Net.Sockets.SocketException x)
+            {
+                throw SocketUtil.convertSocketExceptionToIOException(x);
+            }
+        } catch (IOException ioe) {
+            ResourceManager.afterUdpClose();
+            throw ioe;
         }
     }
 
@@ -515,6 +522,7 @@ class DatagramChannelImpl
     protected void implCloseSelectableChannel() throws IOException {
         synchronized (stateLock) {
             closeImpl();
+            ResourceManager.afterUdpClose();
             long th;
             if ((th = readerThread) != 0)
                 NativeThread.signal(th);