--- a/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java	Sun Apr 22 19:12:39 2012 +0100
+++ b/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java	Sun Apr 22 21:22:17 2012 +0100
@@ -744,7 +744,8 @@
                     if (sm != null)
                         sm.checkConnect(isa.getAddress().getHostAddress(),
                                         isa.getPort());
-                    disconnect0(fd);
+                    boolean isIPv6 = (family == StandardProtocolFamily.INET6);
+                    disconnect0(fd, isIPv6);
                     remoteAddress = null;
                     state = ST_UNCONNECTED;
 
@@ -1079,7 +1080,7 @@
 
     private static native void initIDs();
 
-    private static native void disconnect0(FileDescriptor fd)
+    private static native void disconnect0(FileDescriptor fd, boolean isIPv6)
         throws IOException;
 
     private native int receive0(FileDescriptor fd, long address, int len,

--- a/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c	Sun Apr 22 19:12:39 2012 +0100
+++ b/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c	Sun Apr 22 21:22:17 2012 +0100
@@ -77,7 +77,7 @@
 
 JNIEXPORT void JNICALL
 Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jobject this,
-                                                jobject fdo)
+                                                jobject fdo, jboolean isIPv6)
 {
     jint fd = fdval(env, fdo);
     int rv;
@@ -94,7 +94,7 @@
         memset(&sa, 0, sizeof(sa));
 
 #ifdef AF_INET6
-        if (ipv6_available()) {
+        if (isIPv6) {
             struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)&sa;
 #if defined(_ALLBSD_SOURCE)
             him6->sin6_family = AF_INET6;

--- a/jdk/src/windows/native/sun/nio/ch/DatagramChannelImpl.c	Sun Apr 22 19:12:39 2012 +0100
+++ b/jdk/src/windows/native/sun/nio/ch/DatagramChannelImpl.c	Sun Apr 22 21:22:17 2012 +0100
@@ -108,7 +108,7 @@
 
 JNIEXPORT void JNICALL
 Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jobject this,
-                                                jobject fdo)
+                                                jobject fdo, jboolean isIPv6)
 {
     jint fd = fdval(env, fdo);
     int rv = 0;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/nio/channels/DatagramChannel/Disconnect.java	Sun Apr 22 21:22:17 2012 +0100
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 7132924
+ * @summary Test DatagramChannel.disconnect when DatagramChannel is connected to an IPv4 socket
+ * @run main Disconnect
+ * @run main/othervm -Djava.net.preferIPv4Stack=true Disconnect
+ */
+
+import java.net.*;
+import java.nio.*;
+import java.nio.channels.*;
+import java.io.IOException;
+
+public class Disconnect {
+    public static void main(String[] args) throws IOException {
+        // test with default protocol family
+        try (DatagramChannel dc = DatagramChannel.open()) {
+            test(dc);
+            test(dc);
+        }
+
+        // test with IPv4 only
+        try (DatagramChannel dc = DatagramChannel.open(StandardProtocolFamily.INET)) {
+            test(dc);
+            test(dc);
+        }
+    }
+
+    /**
+     * Connect DatagramChannel to a server, write a datagram and disconnect. Invoke
+     * a second or subsequent time with the same DatagramChannel instance to check
+     * that disconnect works as expected.
+     */
+    static void test(DatagramChannel dc) throws IOException {
+        try (DatagramChannel server = DatagramChannel.open()) {
+            server.bind(new InetSocketAddress(0));
+
+            InetAddress lh = InetAddress.getLocalHost();
+            dc.connect(new InetSocketAddress(lh, server.socket().getLocalPort()));
+
+            dc.write(ByteBuffer.wrap("hello".getBytes()));
+
+            ByteBuffer bb = ByteBuffer.allocate(100);
+            server.receive(bb);
+
+            dc.disconnect();
+
+            try {
+                dc.write(ByteBuffer.wrap("another message".getBytes()));
+                throw new RuntimeException("write should fail, not connected");
+            } catch (NotYetConnectedException expected) {
+            }
+        }
+    }
+}