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.

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

GraalJSScriptEngine: NPE when setting empty engine bindings #849

Open
wants to merge 1 commit into
base: release/graal-vm/23.1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* The Universal Permissive License (UPL), Version 1.0
Expand Down Expand Up @@ -80,6 +80,22 @@ private ScriptEngine getEngine() {
return manager.getEngineByName(TestEngine.TESTED_ENGINE_NAME);
}

@Test
public void engineEmptyBindings() {
ScriptEngine engine = getEngine();
Bindings bindings = engine.createBindings();
engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE);
assertEquals(bindings, engine.getBindings(ScriptContext.ENGINE_SCOPE));
}

@Test
public void globalEmptyBindings() {
ScriptEngine engine = getEngine();
Bindings bindings = engine.createBindings();
engine.setBindings(bindings, ScriptContext.GLOBAL_SCOPE);
assertEquals(bindings, engine.getBindings(ScriptContext.GLOBAL_SCOPE));
}

@Test
public void enginePut() throws ScriptException {
ScriptEngine engine = getEngine();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* The Universal Permissive License (UPL), Version 1.0
Expand Down Expand Up @@ -219,7 +219,11 @@ void importGlobalBindings(ScriptContext scriptContext) {

void updateEngineScriptContext(ScriptContext scriptContext) {
engineScriptContext = scriptContext;
updateContextBinding();
if (context != null) {
updateContextBinding();
} else {
initContext(); // This will also call updateContextBinding()
}
}

}