diff -r 378aa3362868 -r 320a714614e9 jdk/src/solaris/native/sun/xawt/XWindow.c
--- a/jdk/src/solaris/native/sun/xawt/XWindow.c	Tue Mar 06 10:25:45 2012 +0800
+++ b/jdk/src/solaris/native/sun/xawt/XWindow.c	Tue Mar 06 20:34:38 2012 +0000
@@ -867,7 +867,7 @@
 {
     KeySym originalKeysym = *keysym;
 
-#ifndef __linux__
+#if !defined(__linux__) && !defined(MACOSX)
     /* The following code on Linux will cause the keypad keys
      * not to echo on JTextField when the NumLock is on. The
      * keysyms will be 0, because the last parameter 2 is not defined.