--- a/jdk/src/solaris/native/sun/xawt/XWindow.c	Mon Nov 08 18:02:15 2010 +0300
+++ b/jdk/src/solaris/native/sun/xawt/XWindow.c	Tue Nov 09 14:02:54 2010 +0300
@@ -766,7 +766,9 @@
 static Boolean
 isXsunServer(XEvent *event) {
     if( awt_ServerDetected ) return awt_IsXsun;
-    if( strncmp( ServerVendor( event->xkey.display ), "Sun Microsystems, Inc.", 32) ) {
+    if( (strncmp( ServerVendor( event->xkey.display ), "Sun Microsystems, Inc.", 22) != 0) &&
+        (strncmp( ServerVendor( event->xkey.display ), "Oracle Corporation", 18) != 0) )
+    {
         awt_ServerDetected = True;
         awt_IsXsun = False;
         return False;