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

Let parent classloader be configurable (e.g. allows running in app servers) #119

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Let parent classloader be configurable (e.g. allows running in app servers) #119

Show file tree
Hide file tree
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
10 changes: 7 additions & 3 deletions src/javarepl/EvaluationClassLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,16 @@
public class EvaluationClassLoader extends URLClassLoader {
private Sequence<URL> registeredUrls = sequence();

private EvaluationClassLoader(EvaluationContext context) {
super(new URL[]{toURL().apply(context.outputDirectory())});
private EvaluationClassLoader(EvaluationContext context, ClassLoader parentCL) {
super(new URL[]{toURL().apply(context.outputDirectory())}, parentCL);
}

public static EvaluationClassLoader evaluationClassLoader(EvaluationContext context, ClassLoader parentCL) {
return new EvaluationClassLoader(context, parentCL);
}

public static EvaluationClassLoader evaluationClassLoader(EvaluationContext context) {
return new EvaluationClassLoader(context);
return new EvaluationClassLoader(context, context.getClass().getClassLoader());
}

public void registerURL(URL url) {
Expand Down
12 changes: 11 additions & 1 deletion src/javarepl/console/SimpleConsole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,19 @@
import static javarepl.rendering.EvaluationClassRenderer.renderExpressionClass;
import static javarepl.rendering.ExpressionTokenRenderer.EXPRESSION_TOKEN;

public final class SimpleConsole implements Console {
public class SimpleConsole implements Console {
private final Container context;
private ConsoleStatus status = Idle;

public SimpleConsole(ConsoleConfig config) {
this(config, null);
}

public SimpleConsole(ConsoleConfig config, ClassLoader parentCL) {
registerShutdownHook();

context = new SimpleContainer();
context.addInstance(ClassLoader.class, parentCL != null ? parentCL : getDefaultClassLoader(config, context));
context.addInstance(Container.class, context);
context.addInstance(Console.class, this);
context.addInstance(ConsoleHistory.class, historyFromFile(startsWith(":h!").or(blank()), config.historyFile));
Expand All @@ -62,6 +67,11 @@ public SimpleConsole(ConsoleConfig config) {
context.get(Evaluator.class).addResults(config.results);
}

protected ClassLoader getDefaultClassLoader(ConsoleConfig config, Container context)
{
return context.getClass().getClassLoader();
}

public ConsoleResult execute(String expression) {
context.get(ConsoleHistory.class).add(expression);
return executeExpression(expression);
Expand Down