stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6612497: api/java_awt/Container/index.html#isAncestorOf Container2019 hangs since JDK 7 b15

Browse Source 
Partial rollback changes for 6567564 in the Component.getGC method

Reviewed-by: art, son
This commit is contained in:
Dmitry Cherepanov 2008-03-14 18:27:34 +03:00
parent 07a1367346
commit f97f9eb9a5
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jdk/src/share/classes/java/awt/Component.java
View File

@ -935,24 +935,26 @@ public abstract class Component implements ImageObserver, MenuContainer,
*/
public GraphicsConfiguration getGraphicsConfiguration() {
synchronized(getTreeLock()) {
GraphicsConfiguration gc = graphicsConfig;
Component parent = getParent();
while ((gc == null) && (parent != null)) {
gc = parent.getGraphicsConfiguration();
parent = parent.getParent();
if (graphicsConfig != null) {
return graphicsConfig;
} else if (getParent() != null) {
return getParent().getGraphicsConfiguration();
} else {
return null;
}
return gc;
}
}
final GraphicsConfiguration getGraphicsConfiguration_NoClientCode() {
GraphicsConfiguration gc = this.graphicsConfig;
Component par = this.parent;
while ((gc == null) && (par != null)) {
gc = par.getGraphicsConfiguration_NoClientCode();
par = par.parent;
GraphicsConfiguration graphicsConfig = this.graphicsConfig;
Container parent = this.parent;
if (graphicsConfig != null) {
return graphicsConfig;
} else if (parent != null) {
return parent.getGraphicsConfiguration_NoClientCode();
} else {
return null;
}
return gc;
}
/**