Uploaded image for project: 'JDK'
  1. JDK
  2. JDK-8020298

[macosx] Incorrect merge in the lwawt code.

XMLWordPrintable

    • b100
    • Verified

        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();

              serb Sergey Bylokhov
              serb Sergey Bylokhov
              Votes:
              0 Vote for this issue
              Watchers:
              5 Start watching this issue

                Created:
                Updated:
                Resolved: