diff -r 2a390122edff -r 0e6f2837eeca jdk/src/share/classes/java/beans/MethodDescriptor.java
--- a/jdk/src/share/classes/java/beans/MethodDescriptor.java	Tue Jun 15 21:32:59 2010 +0400
+++ b/jdk/src/share/classes/java/beans/MethodDescriptor.java	Tue Jun 22 12:06:33 2010 +0400
@@ -82,21 +82,21 @@
         Method method = getMethod0();
         if (method == null) {
             Class cls = getClass0();
-            if (cls != null) {
+            String name = getName();
+            if ((cls != null) && (name != null)) {
                 Class[] params = getParams();
                 if (params == null) {
                     for (int i = 0; i < 3; i++) {
                         // Find methods for up to 2 params. We are guessing here.
                         // This block should never execute unless the classloader
                         // that loaded the argument classes disappears.
-                        method = Introspector.findMethod(cls, getName(), i, null);
+                        method = Introspector.findMethod(cls, name, i);
                         if (method != null) {
                             break;
                         }
                     }
                 } else {
-                    method = Introspector.findMethod(cls, getName(),
-                                                     params.length, params);
+                    method = Statement.getMethod(cls, name, params);
                 }
                 setMethod(method);
             }