--- a/jdk/src/share/classes/java/beans/Introspector.java	Tue Nov 16 10:47:01 2010 -0800
+++ b/jdk/src/share/classes/java/beans/Introspector.java	Wed Nov 17 22:17:01 2010 +0300
@@ -29,6 +29,8 @@
 import com.sun.beans.finder.BeanInfoFinder;
 import com.sun.beans.finder.ClassFinder;
 
+import java.awt.Component;
+
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
 import java.lang.reflect.Method;
@@ -39,6 +41,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.EventListener;
+import java.util.EventObject;
 import java.util.List;
 import java.util.TreeMap;
 import java.util.WeakHashMap;
@@ -1234,7 +1237,23 @@
             }
         }
         // OK, fabricate a default BeanDescriptor.
-        return (new BeanDescriptor(beanClass));
+        return new BeanDescriptor(this.beanClass, findCustomizerClass(this.beanClass));
+    }
+
+    private static Class<?> findCustomizerClass(Class<?> type) {
+        String name = type.getName() + "Customizer";
+        try {
+            type = ClassFinder.findClass(name, type.getClassLoader());
+            // Each customizer should inherit java.awt.Component and implement java.beans.Customizer
+            // according to the section 9.3 of JavaBeans specification
+            if (Component.class.isAssignableFrom(type) && Customizer.class.isAssignableFrom(type)) {
+                return type;
+            }
+        }
+        catch (Exception exception) {
+            // ignore any exceptions
+        }
+        return null;
     }
 
     private boolean isEventHandler(Method m) {
@@ -1244,10 +1263,7 @@
         if (argTypes.length != 1) {
             return false;
         }
-        if (isSubclass(argTypes[0], java.util.EventObject.class)) {
-            return true;
-        }
-        return false;
+        return isSubclass(argTypes[0], EventObject.class);
     }
 
     /*

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/Test6447751.java	Wed Nov 17 22:17:01 2010 +0300
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6447751
+ * @summary Tests automatic search for customizers
+ * @author Sergey Malenkov
+ */
+
+import java.awt.Component;
+import java.beans.Customizer;
+import java.beans.Introspector;
+import java.beans.IntrospectionException;
+import java.beans.SimpleBeanInfo;
+import java.beans.BeanDescriptor;
+import java.beans.PropertyChangeListener;
+
+public class Test6447751 {
+
+    public static void main(String[] args) {
+        test(Manual.class, AutomaticCustomizer.class);
+        test(Illegal.class, null);
+        test(Automatic.class, AutomaticCustomizer.class);
+    }
+
+    private static void test(Class<?> type, Class<?> expected) {
+        Class<?> actual;
+        try {
+            actual = Introspector.getBeanInfo(type).getBeanDescriptor().getCustomizerClass();
+        }
+        catch (IntrospectionException exception) {
+            throw new Error("unexpected error", exception);
+        }
+        if (actual != expected) {
+            StringBuilder sb = new StringBuilder();
+            sb.append("bean ").append(type).append(": ");
+            if (expected != null) {
+                sb.append("expected ").append(expected);
+                if (actual != null) {
+                    sb.append(", but ");
+                }
+            }
+            if (actual != null) {
+                sb.append("found ").append(actual);
+            }
+            throw new Error(sb.toString());
+        }
+    }
+
+    public static class Automatic {
+    }
+    public static class AutomaticCustomizer extends Component implements Customizer {
+        public void setObject(Object bean) {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    public static class Illegal {
+    }
+    public static class IllegalCustomizer implements Customizer {
+        public void setObject(Object bean) {
+            throw new UnsupportedOperationException();
+        }
+        public void addPropertyChangeListener(PropertyChangeListener listener) {
+            throw new UnsupportedOperationException();
+        }
+        public void removePropertyChangeListener(PropertyChangeListener listener) {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    public static class Manual {
+    }
+    public static class ManualBeanInfo extends SimpleBeanInfo {
+        public BeanDescriptor getBeanDescriptor() {
+            return new BeanDescriptor(Manual.class, AutomaticCustomizer.class);
+        }
+    }
+}