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.

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

Jump to bottom

Issue #226: Provide SPI interfaces to locate descriptors and JCas classes #249

Merged
merged 3 commits into from
Aug 31, 2022
Merged

Issue #226: Provide SPI interfaces to locate descriptors and JCas classes #249

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1571bdd
Issue #226: Provide SPI interfaces to locate descriptors and JCas cla…
reckart Aug 29, 2022
08c4a01
Merge branch 'main' into feature/226-Provide-SPI-interfaces-to-locate…
reckart Aug 29, 2022
647793d
Issue #226: Provide SPI interfaces to locate descriptors and JCas cla…
reckart Aug 29, 2022
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
23 changes: 22 additions & 1 deletion uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Parameter;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
Expand Down Expand Up @@ -198,6 +199,8 @@ public abstract class FSClassRegistry { // abstract to prevent instantiating; th
private static final WeakIdentityMap<ClassLoader, StackTraceElement[]> cl_to_type2JCasStacks;
private static final WeakIdentityMap<ClassLoader, Map<String, Class<? extends TOP>>> cl_to_spiJCas = WeakIdentityMap
.newHashMap();
private static final WeakIdentityMap<ClassLoader, UIMAClassLoader> cl_to_uimaCl = WeakIdentityMap
.newHashMap();

// private static final Map<ClassLoader, Map<String, JCasClassInfo>> cl_4pears_to_type2JCas =
// Collections.synchronizedMap(new IdentityHashMap<>()); // identity: key is classloader
Expand Down Expand Up @@ -1749,10 +1752,28 @@ static Map<String, JCasClassInfo> get_className_to_jcci(ClassLoader cl, boolean
}
}

private static final URL[] NO_URLS = new URL[0];

static Lookup getLookup(ClassLoader cl) {
Lookup lookup = null;
try {
Class<?> clazz = Class.forName(UIMAClassLoader.MHLC, true, cl);
// The UIMAClassLoader has special handling for the MHLC, so we must make sure that the CL
// we are using is actually a UIMAClassLoader, otherwise the MHCL will look up in the wrong
// CL. This is in particular an issue for classes loaded through the SPI mechanism.
UIMAClassLoader ucl;
if (!(cl instanceof UIMAClassLoader)) {
synchronized (cl_to_uimaCl) {
ucl = cl_to_uimaCl.get(cl);
if (ucl == null) {
ucl = new UIMAClassLoader(NO_URLS, cl);
cl_to_uimaCl.put(cl, ucl);
}
}
} else {
ucl = (UIMAClassLoader) cl;
}

Class<?> clazz = Class.forName(UIMAClassLoader.MHLC, true, ucl);
Method m = clazz.getMethod("getMethodHandlesLookup");
lookup = (Lookup) m.invoke(null);
} catch (ClassNotFoundException | NoSuchMethodException | SecurityException
Expand Down