From be12a1bdf1e5e85e7c08ca58b6598fd04385712b Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Tue, 9 Jun 2009 05:17:36 +0000 Subject: [PATCH] Disabled NIO constraint level autodetection for IBM JDK 1.6 --- .../socket/nio/NioProviderMetadata.java | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioProviderMetadata.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioProviderMetadata.java index b5f104a928..f4b1c51e5c 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioProviderMetadata.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioProviderMetadata.java @@ -184,25 +184,35 @@ class NioProviderMetadata { if (provider.equals("sun.nio.ch.PollSelectorProvider")) { return 1; } - } else if (version.equals("1.6") || version.matches("^1\\.6\\D.*$")) { - if (provider.equals("sun.nio.ch.EPollSelectorProvider") || - provider.equals("sun.nio.ch.PollSelectorProvider")) { - return 2; - } } + // Commented out - the constraint level of IBM JDK 1.6 is + // different between versions. + // + //else if (version.equals("1.6") || version.matches("^1\\.6\\D.*$")) { + // if (provider.equals("sun.nio.ch.EPollSelectorProvider") || + // provider.equals("sun.nio.ch.PollSelectorProvider")) { + // return 2; + // } + //} + // AIX } if (os.indexOf("aix") >= 0) { if (version.equals("1.5") || version.matches("^1\\.5\\D.*$")) { if (provider.equals("sun.nio.ch.PollSelectorProvider")) { return 1; } - } else if (version.equals("1.6") || version.matches("^1\\.6\\D.*$")) { - if (provider.equals("sun.nio.ch.EPollSelectorProvider") || - provider.equals("sun.nio.ch.PollSelectorProvider")) { - return 2; - } } + + // Commented out - the constraint level of IBM JDK 1.6 is + // different between versions. + // + //else if (version.equals("1.6") || version.matches("^1\\.6\\D.*$")) { + // if (provider.equals("sun.nio.ch.EPollSelectorProvider") || + // provider.equals("sun.nio.ch.PollSelectorProvider")) { + // return 2; + // } + //} } // BEA } else if (vendor.indexOf("bea") >= 0 || vendor.indexOf("oracle") >= 0) {