--- a/jdk/src/windows/native/sun/windows/awt_Component.cpp	Tue Jun 23 13:35:58 2009 +0400
+++ b/jdk/src/windows/native/sun/windows/awt_Component.cpp	Tue Jun 23 15:10:02 2009 +0400
@@ -5975,17 +5975,7 @@
     env->DeleteGlobalRef(self);
 
     delete cpps;
-
-    if (result != NULL)
-    {
-        jintArray resultGlobalRef = (jintArray)env->NewGlobalRef(result);
-        env->DeleteLocalRef(result);
-        return resultGlobalRef;
-    }
-    else
-    {
-        return NULL;
-    }
+    return result; // this reference is global
 }
 
 jboolean AwtComponent::_IsObscured(void *param)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java	Tue Jun 23 15:10:02 2009 +0400
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+  @test
+  @bug 6736247
+  @summary Component.printAll Invalid local JNI handle
+  @author Dmitry Cherepanov: area=awt.component
+  @run  main/othervm -Xcheck:jni PrintAllXcheckJNI
+*/
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+
+public class PrintAllXcheckJNI
+{
+    public static void main(String []s)
+    {
+        Frame frame = new Frame();
+        frame.setVisible(true);
+
+        BufferedImage img = new BufferedImage(frame.getWidth(),
+                                              frame.getHeight(),
+                                              BufferedImage.TYPE_INT_RGB);
+        Graphics2D g = img.createGraphics();
+
+        frame.printAll(g);
+
+        g.dispose();
+        img.flush();
+    }
+}