--- a/jdk/src/solaris/classes/sun/awt/X11/XRepaintArea.java	Mon Jan 20 14:23:51 2014 +0400
+++ b/jdk/src/solaris/classes/sun/awt/X11/XRepaintArea.java	Mon Jan 20 20:11:09 2014 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -28,8 +28,8 @@
 
 import java.awt.Component;
 import java.awt.Graphics;
+
 import sun.awt.RepaintArea;
-import java.awt.peer.ComponentPeer;
 
 /**
  * The <code>RepaintArea</code> is a geometric construct created for the
@@ -39,24 +39,15 @@
  *
  * @author      Eric Hawkes
  */
-class XRepaintArea extends RepaintArea {
-
-    /**
-     * Constructs a new <code>XRepaintArea</code>
-     * @since   1.3
-     */
-    public XRepaintArea() {
-    }
+final class XRepaintArea extends RepaintArea {
 
     /**
      * Calls <code>Component.update(Graphics)</code> with given Graphics.
      */
     protected void updateComponent(Component comp, Graphics g) {
         if (comp != null) {
-            final XComponentPeer peer = (XComponentPeer) comp.getPeer();
-            if (peer != null) {
-                peer.paintPeer(g);
-            }
+            // We don't call peer.paintPeer() here, because we shouldn't paint
+            // native component when processing UPDATE events.
             super.updateComponent(comp, g);
         }
     }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Paint/PaintNativeOnUpdate.java	Mon Jan 20 20:11:09 2014 +0400
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+import java.awt.AWTException;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Label;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.Toolkit;
+
+import sun.awt.SunToolkit;
+
+/**
+ * @test
+ * @bug 7157680
+ * @author Sergey Bylokhov
+ */
+public final class PaintNativeOnUpdate extends Label {
+
+    private boolean fullUpdate = true;
+
+    public static void main(final String[] args) throws AWTException {
+        final Frame frame = new Frame();
+        final Component label = new PaintNativeOnUpdate();
+        frame.setBackground(Color.RED);
+        frame.add(label);
+        frame.setSize(300, 300);
+        frame.setUndecorated(true);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+        sleep();
+        label.repaint();// first paint
+        sleep();
+        label.repaint();// incremental paint
+        sleep();
+
+        Robot robot = new Robot();
+        robot.setAutoDelay(50);
+        Point point = label.getLocationOnScreen();
+        Color color = robot.getPixelColor(point.x + label.getWidth() / 2,
+                                          point.y + label.getHeight() / 2);
+        if (!color.equals(Color.GREEN)) {
+            System.err.println("Expected color = " + Color.GREEN);
+            System.err.println("Actual color = " + color);
+            throw new RuntimeException();
+        }
+        frame.dispose();
+    }
+
+    @Override
+    public void update(final Graphics g) {
+        if (fullUpdate) {
+            //full paint
+            g.setColor(Color.GREEN);
+            g.fillRect(0, 0, getWidth(), getHeight());
+            fullUpdate = false;
+        } else {
+            // Do nothing
+            // incremental paint
+        }
+    }
+
+    @Override
+    public void paint(final Graphics g) {
+        // Do nothing
+    }
+
+    private static void sleep() {
+        try {
+            ((SunToolkit) (Toolkit.getDefaultToolkit())).realSync();
+            Thread.sleep(1000);
+        } catch (InterruptedException ignored) {
+        }
+    }
+}