andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disabled NIO constraint level autodetection for IBM JDK 1.6

Browse Source
This commit is contained in:
Trustin Lee 2009-06-09 05:17:36 +00:00
parent 645ba6d3b9
commit be12a1bdf1
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/org/jboss/netty/channel/socket/nio/NioProviderMetadata.java
View File

@ -184,25 +184,35 @@ class NioProviderMetadata {
if (provider.equals("sun.nio.ch.PollSelectorProvider")) { if (provider.equals("sun.nio.ch.PollSelectorProvider")) {
return 1; 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 // AIX
} if (os.indexOf("aix") >= 0) { } if (os.indexOf("aix") >= 0) {
if (version.equals("1.5") || version.matches("^1\\.5\\D.*$")) { if (version.equals("1.5") || version.matches("^1\\.5\\D.*$")) {
if (provider.equals("sun.nio.ch.PollSelectorProvider")) { if (provider.equals("sun.nio.ch.PollSelectorProvider")) {
return 1; 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 // BEA
} else if (vendor.indexOf("bea") >= 0 || vendor.indexOf("oracle") >= 0) { } else if (vendor.indexOf("bea") >= 0 || vendor.indexOf("oracle") >= 0) {