Skip to content

[2.2.x] OPENJPA-2817: OpenJPA enhancer needs improved reentrancy #64

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.

Sign up for GitHub

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

Merged
jgrassel merged 1 commit into from
Jul 13, 2020
Merged

[2.2.x] OPENJPA-2817: OpenJPA enhancer needs improved reentrancy #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCClassFileTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public class PCClassFileTransformer

private static final Localizer _loc = Localizer.forPackage
(PCClassFileTransformer.class);
private static final ThreadLocal<Boolean> _isTransformingInLocalThread = new ThreadLocal(); // OJ-2817

private final MetaDataRepository _repos;
private final PCEnhancer.Flags _flags;
Expand Down Expand Up @@ -120,12 +121,17 @@ public byte[] transform(ClassLoader loader, String className,
// prevent re-entrant calls, which can occur if the enhancing
// loader is used to also load OpenJPA libraries; this is to prevent
// recursive enhancement attempts for internal openjpa libraries
if (_transforming)
Boolean transforming = _isTransformingInLocalThread.get();
if (transforming != null) {
return null;

_transforming = true;
}
_isTransformingInLocalThread.set(Boolean.TRUE);

return transform0(className, redef, bytes);
try {
return transform0(className, redef, bytes);
} finally {
_isTransformingInLocalThread.remove();
}
}

/**
Expand Down