Skip to content

Fix CONRAD.getClasses when running with pyconrad #140

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

Open
theHamsta wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix CONRAD.getClasses when running with pyconrad #140

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ca58eb
Fix CONRAD.getClasses when running with pyconrad
theHamsta Apr 20, 2019
eef2a99
Make member classLoaderForPyconrad public (necessary for new pyconrad
theHamsta Jul 9, 2019
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
3 changes: 3 additions & 0 deletions src/edu/stanford/rsl/conrad/utils/CONRAD.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public abstract class CONRAD {
public static boolean useGarbageCollection;
public static final String EOL = System.getProperty("line.separator");
public static final long INPUT_QUEUE_DELAY = 0;
public static ClassLoader classLoaderForPyconrad = null; /// Regular ClassLoader doesnot work with pyconrad since Thread is detached from JVM
/**
* This flag can be used to control debug outputs.
* 0: No Debug output
Expand Down Expand Up @@ -272,6 +273,8 @@ private synchronized static ArrayList<Object> getInstancesFromConradFromClasspat
private static ArrayList<Class<? extends Object>> getClasses(String packageName)
throws ClassNotFoundException, IOException {
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
if (classLoader == null )
classLoader = CONRAD.classLoaderForPyconrad;
assert classLoader != null;
String path = packageName.replace('.', '/');
Enumeration<URL> resources = classLoader.getResources(path);
Expand Down