--- a/jdk/test/sun/nio/ch/SelProvider.java Wed Jun 06 10:05:54 2012 +0800
+++ b/jdk/test/sun/nio/ch/SelProvider.java Wed Jun 06 17:59:29 2012 +0100
@@ -31,19 +31,23 @@
public class SelProvider {
public static void main(String[] args) throws Exception {
- String osname = System.getProperty("os.name");
- String osver = System.getProperty("os.version");
- String spName = SelectorProvider.provider().getClass().getName();
- String expected = null;
- if ("SunOS".equals(osname)) {
- expected = "sun.nio.ch.DevPollSelectorProvider";
- } else if ("Linux".equals(osname)) {
- expected = "sun.nio.ch.EPollSelectorProvider";
- } else if (osname.contains("OS X")) {
- expected = "sun.nio.ch.KQueueSelectorProvider";
- } else
- return;
- if (!spName.equals(expected))
+ String expected = System.getProperty("java.nio.channels.spi.SelectorProvider");
+ if (expected == null) {
+ String osname = System.getProperty("os.name");
+ String osver = System.getProperty("os.version");
+ if ("SunOS".equals(osname)) {
+ expected = "sun.nio.ch.DevPollSelectorProvider";
+ } else if ("Linux".equals(osname)) {
+ expected = "sun.nio.ch.EPollSelectorProvider";
+ } else if (osname.contains("OS X")) {
+ expected = "sun.nio.ch.KQueueSelectorProvider";
+ } else {
+ return;
+ }
+ }
+ String cn = SelectorProvider.provider().getClass().getName();
+ System.out.println(cn);
+ if (!cn.equals(expected))
throw new Exception("failed");
}
}