From 7a503f15192f258e8541caf11c7f2439ffe3a9ea Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Mon, 1 Sep 2008 07:56:24 +0000
Subject: [PATCH] * Added support for JRockit VMs * Fixed incorrect test result
 on Windows and Solaris for Sun VMs

---
 .../socket/nio/NioProviderMetadata.java       | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 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 e4b2d1adcb..90df49b62d 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
@@ -145,13 +145,13 @@ class NioProviderMetadata {
 
             // Windows
             } else if (os.indexOf("windows") >= 0) {
-                if (provider.equals("sun.nio.ch.DevPollSelectorProvider")) {
+                if (provider.equals("sun.nio.ch.WindowsSelectorProvider")) {
                     return 0;
                 }
 
             // Solaris
             } else if (os.indexOf("sun") >= 0 || os.indexOf("solaris") >= 0) {
-                if (provider.equals("sun.nio.ch.WindowsSelectorProvider")) {
+                if (provider.equals("sun.nio.ch.DevPollSelectorProvider")) {
                     return 0;
                 }
             }
@@ -178,6 +178,21 @@ class NioProviderMetadata {
                     }
                 }
             }
+        // BEA
+        } else if (vendor.indexOf("bea") >= 0 || vendor.indexOf("oracle") >= 0) {
+            // Linux
+            if (os.indexOf("linux") >= 0) {
+                if (provider.equals("sun.nio.ch.EPollSelectorProvider") ||
+                    provider.equals("sun.nio.ch.PollSelectorProvider")) {
+                    return 0;
+                }
+
+            // Windows
+            } else if (os.indexOf("windows") >= 0) {
+                if (provider.equals("sun.nio.ch.WindowsSelectorProvider")) {
+                    return 0;
+                }
+            }
         }
 
         // Others (untested)