diff --git a/jdk/src/share/classes/java/awt/Container.java b/jdk/src/share/classes/java/awt/Container.java index 4f51dabce8a..e3372409c06 100644 --- a/jdk/src/share/classes/java/awt/Container.java +++ b/jdk/src/share/classes/java/awt/Container.java @@ -4111,16 +4111,16 @@ public class Container extends Component { mixingLog.fine("this = " + this); } - if (!isMixingNeeded()) { - return; - } - boolean isLightweight = isLightweight(); if (isLightweight && isRecursivelyVisibleUpToHeavyweightContainer()) { recursiveShowHeavyweightChildren(); } + if (!isMixingNeeded()) { + return; + } + if (!isLightweight || (isLightweight && hasHeavyweightDescendants())) { recursiveApplyCurrentShape(); }