diff -r fd16c54261b3 -r 90ce3da70b43 jdk/test/sun/security/smartcardio/TestMultiplePresent.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/smartcardio/TestMultiplePresent.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 6239117 6445367
+ * @summary test that CardTerminals.waitForCard() works
+ * @author Andreas Sterbenz
+ * @ignore requires special hardware
+ * @run main/manual TestPresent
+ */
+
+import java.io.*;
+import java.util.*;
+
+import javax.smartcardio.*;
+import static javax.smartcardio.CardTerminals.State.*;
+
+public class TestMultiplePresent {
+
+    public static void main(String[] args) throws Exception {
+        Utils.setLibrary(args);
+        TerminalFactory factory = TerminalFactory.getInstance("PC/SC", null);
+        System.out.println(factory);
+
+        CardTerminals terminals = factory.terminals();
+        List<CardTerminal> list = terminals.list();
+        System.out.println("Terminals: " + list);
+        boolean multipleReaders = true;
+        if (list.size() < 2) {
+            if (list.isEmpty()) {
+                throw new Exception("no terminals");
+            }
+            System.out.println("Only one reader present, using simplified test");
+            multipleReaders = false;
+        }
+
+        while (true) {
+            boolean present = false;
+            for (CardTerminal terminal : list) {
+                present |= terminal.isCardPresent();
+            }
+            if (present == false) {
+                break;
+            }
+            System.out.println("*** Remove all cards!");
+            Thread.sleep(1000);
+        }
+        System.out.println("OK");
+
+        List<CardTerminal> result;
+
+        result = terminals.list(CARD_PRESENT);
+        if (result.size() != 0) {
+            throw new Exception("List not empty: " + result);
+        }
+
+        if (terminals.waitForChange(1000)) {
+            throw new Exception("no timeout");
+        }
+        if (terminals.waitForChange(1000)) {
+            throw new Exception("no timeout");
+        }
+        result = terminals.list(CARD_PRESENT);
+        if (result.size() != 0) {
+            throw new Exception("List not empty: " + result);
+        }
+
+        System.out.println("*** Insert card!");
+        terminals.waitForChange();
+
+        result = terminals.list(CARD_INSERTION);
+        System.out.println(result);
+        if (result.size() != 1) {
+            throw new Exception("no card present");
+        }
+        CardTerminal t1 = result.get(0);
+
+        result = terminals.list(CARD_INSERTION);
+        System.out.println(result);
+        if ((result.size() != 1) || (result.get(0) != t1)) {
+            throw new Exception("no card present");
+        }
+
+        if (terminals.list(CARD_REMOVAL).size() != 0) {
+            throw new Exception("List not empty: " + result);
+        }
+        if (terminals.list(CARD_REMOVAL).size() != 0) {
+            throw new Exception("List not empty: " + result);
+        }
+
+
+        if (terminals.waitForChange(1000)) {
+            throw new Exception("no timeout");
+        }
+
+        if (terminals.list(CARD_REMOVAL).size() != 0) {
+            throw new Exception("List not empty: " + result);
+        }
+
+        if (multipleReaders) {
+            System.out.println("*** Insert card into other reader!");
+            terminals.waitForChange();
+
+            result = terminals.list(CARD_INSERTION);
+            System.out.println(result);
+            if (result.size() != 1) {
+                throw new Exception("no card present");
+            }
+            CardTerminal t2 = result.get(0);
+            if (t1.getName().equals(t2.getName())) {
+                throw new Exception("same terminal");
+            }
+
+            System.out.println("*** Remove card from 2nd reader!");
+            terminals.waitForChange();
+
+            if (terminals.list(CARD_INSERTION).size() != 0) {
+                throw new Exception("List not empty: " + result);
+            }
+            result = terminals.list(CARD_REMOVAL);
+            if ((result.size() != 1) || (result.get(0) != t2)) {
+                throw new Exception("no or wrong terminal");
+            }
+        }
+
+        System.out.println("*** Remove card from 1st reader!");
+        terminals.waitForChange();
+
+        if (terminals.list(CARD_INSERTION).size() != 0) {
+            throw new Exception("List not empty: " + result);
+        }
+        result = terminals.list(CARD_REMOVAL);
+        if ((result.size() != 1) || (result.get(0) != t1)) {
+            throw new Exception("no or wrong terminal");
+        }
+
+        System.out.println("OK.");
+    }
+
+}