Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Double-checked locking for WebApp#classMap #397

Merged
merged 1 commit into from
Aug 8, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions core/src/main/java/org/kohsuke/stapler/WebApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -218,26 +218,32 @@ public void setClassLoader(ClassLoader classLoader) {
this.classLoader = classLoader;
}

public MetaClass getMetaClass(Class c) {
return getMetaClass(Klass.java(c));
}

public MetaClass getMetaClass(Klass<?> c) {
if(c==null) return null;
if (c.navigator == KlassNavigator.JAVA) {
ClassValue<MetaClass> _classMap;
private ClassValue<MetaClass> getClassMap() {
ClassValue<MetaClass> _classMap = classMap;
if (_classMap == null) {
synchronized (this) {
if (classMap == null) {
classMap = new ClassValue<MetaClass>() {
_classMap = classMap;
if (_classMap == null) {
classMap = _classMap = new ClassValue<>() {
@Override
protected MetaClass computeValue(Class<?> c) {
return new MetaClass(WebApp.this, Klass.java(c));
}
};
}
_classMap = classMap;
}
return _classMap.get(c.toJavaClass());
}
return _classMap;
}

public MetaClass getMetaClass(Class c) {
return getMetaClass(Klass.java(c));
}

public MetaClass getMetaClass(Klass<?> c) {
if(c==null) return null;
if (c.navigator == KlassNavigator.JAVA) {
return getClassMap().get(c.toJavaClass());
} else {
// probably now impossible outside tests
return new MetaClass(this,c);
Expand Down