Skip to content

[ZEPPELIN-1972] Preserve context classloader #1911

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

Closed
DrIgor wants to merge 1 commit into from
Closed

[ZEPPELIN-1972] Preserve context classloader #1911

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
22 changes: 15 additions & 7 deletions ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,20 @@ private Ignite getIgnite() {
}

private void initIgnite() {
imain.interpret("@transient var _binder = new java.util.HashMap[String, Object]()");
Map<String, Object> binder = (Map<String, Object>) getLastObject();
ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
try {
imain.interpret("@transient var _binder = new java.util.HashMap[String, Object]()");
Map<String, Object> binder = (Map<String, Object>) getLastObject();

if (getIgnite() != null) {
binder.put("ignite", ignite);
if (getIgnite() != null) {
binder.put("ignite", ignite);

imain.interpret("@transient val ignite = "
+ "_binder.get(\"ignite\")"
+ ".asInstanceOf[org.apache.ignite.Ignite]");
imain.interpret("@transient val ignite = "
+ "_binder.get(\"ignite\")"
+ ".asInstanceOf[org.apache.ignite.Ignite]");
}
} finally {
Thread.currentThread().setContextClassLoader(contextClassLoader);
}
}

Expand Down Expand Up @@ -279,11 +284,14 @@ private InterpreterResult interpret(String[] lines) {
}
}

ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
try {
code = getResultCode(imain.interpret(incomplete + s));
} catch (Exception e) {
logger.info("Interpreter exception", e);
return new InterpreterResult(Code.ERROR, InterpreterUtils.getMostRelevantMessage(e));
} finally {
Thread.currentThread().setContextClassLoader(contextClassLoader);
}

if (code == Code.ERROR) {
Expand Down