JDK-8020298 : [macosx] Incorrect merge in the lwawt code.
  • Type: Bug
  • Component: client-libs
  • Sub-Component: java.awt
  • Affected Version: 7u40,8
  • Priority: P2
  • Status: Closed
  • Resolution: Fixed
  • Submitted: 2013-07-10
  • Updated: 2013-11-07
  • Resolved: 2013-07-12
The Version table provides details related to the release that this issue/RFE will be addressed.

Unresolved : Release in which this issue/RFE will be addressed.
Resolved: Release in which this issue/RFE has been resolved.
Fixed : Release in which this issue/RFE has been fixed. The release containing this fix may be available for download as an Early Access Release or a General Availability Release.

To download the current JDK release, click here.
JDK 7 JDK 8
7u40Fixed 8 b100Fixed
Description
Some fixes were incorrectly merged into the jdk8-dev and jdk7u-dev.

jdk8:
http://hg.openjdk.java.net/jdk8/awt/jdk/rev/aa4610fe8a73
- peer.notifyReshape(x, y, width, height);
+
final GraphicsConfiguration newGC = peer.getGraphicsConfiguration();
// System-dependent appearance optimization.
+ if (peer != null) {
+ peer.notifyReshape(x, y, width, height);
+ }
+ 

jdk7:
http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/9062acbc098c

- final GraphicsConfiguration oldGC = peer.getGraphicsConfiguration();
- peer.notifyReshape(x, y, width, height);
- final GraphicsConfiguration newGC = peer.getGraphicsConfiguration();
+ final GraphicsConfiguration oldGC = contentView.getGraphicsConfiguration();
+
+ if (peer!= null) {
+ peer.notifyReshape(x, y, width, height);
+ }
+
+ final GraphicsConfiguration newGC = contentView.getGraphicsConfiguration(); 

Comments
Verified, code is here in jdk8 b113 sources, as expected.
07-11-2013

7u40-critical-request justification: The problem is in incorrect merge between JDK-8009012 and JDK-8003559. Manual merge required, because both fixes change the same method in the different way. Bug: http://bugs.sun.com/view_bug.do?bug_id=8020298 Webrev: http://cr.openjdk.java.net/~serb/8020298/webrev.8/ http://cr.openjdk.java.net/~serb/8020298/webrev.7/ Review: http://mail.openjdk.java.net/pipermail/awt-dev/2013-July/005142.html Reviewers: Artem Ananiev, Anthony Petrov JDK 8 changeset: http://hg.openjdk.java.net/jdk8/awt/jdk/rev/f7ea38893138
12-07-2013

Need justification and SQE-OK before this can be approved.
12-07-2013