From 5751fb4a860cccab80e7980cea234cb4fa131a52 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Mon, 5 Dec 2011 12:23:46 +0000
Subject: [PATCH] 7117717: (aio) Tests failing due to implementation bug
 7052549

Reviewed-by: weijun, chegar
---
 jdk/test/ProblemList.txt                                      | 4 ++--
 .../java/nio/channels/AsynchronousSocketChannel/Basic.java    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 0860daf7086..5e0d3743a01 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -400,8 +400,8 @@ java/io/File/Basic.java                                         windows-all
 # 6963118
 java/nio/channels/Selector/Wakeup.java                          windows-all
 
-# 7076700
-java/nio/channels/SocketChannel/AdaptSocket.java                generic-all
+# 7052549
+java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java 	windows-all
 
 ############################################################################
 
diff --git a/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java b/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java
index 32b6c837733..9442f9b5408 100644
--- a/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java
+++ b/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java
@@ -63,7 +63,9 @@ public class Basic {
         testRead3();
         testWrite1();
         testWrite2();
-        testTimeout();
+        // skip timeout tests until 7052549 is fixed
+        if (!System.getProperty("os.name").startsWith("Windows"))
+            testTimeout();
         testShutdown();
     }