Skip to content

Remove Weak object reference from v8WeakReference array when released #448

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove Weak object reference from v8WeakReference array when released #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b87e8c7
Remove Weak object reference from v8WeakReference array when released
Jan 18, 2019
67c6479
Merge branch 'master' into release_weak_object
irbull Apr 26, 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
10 changes: 6 additions & 4 deletions src/main/java/com/eclipsesource/v8/V8Value.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ abstract public class V8Value implements Releasable {
public static final int FLOAT_32_ARRAY = 16;
public static final int UNDEFINED = 99;

protected V8 v8;
protected long objectHandle;
protected boolean released = true;
protected V8 v8;
protected long objectHandle;
protected boolean released = true;

protected V8Value() {
super();
Expand Down Expand Up @@ -83,7 +83,6 @@ protected void addObjectReference(final long objectHandle) throws Error {
}
}


/**
* Returns a string representation of the V8 Type.
* @param type Type to return as a string. See constants in V8Value.
Expand Down Expand Up @@ -272,6 +271,9 @@ public void close() {
v8.checkThread();
if (!released) {
try {
if (isWeak()) {
v8.v8WeakReferences.remove(getHandle());
}
v8.releaseObjRef(this);
} finally {
released = true;
Expand Down
11 changes: 9 additions & 2 deletions src/test/java/com/eclipsesource/v8/V8ObjectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,7 +1317,7 @@ public void testGetTypeFunction() {
public void testGetKeysOnObject() {
V8Object v8Object = new V8Object(v8);
v8Object.add("integer", 1).add("double", 1.1).add("boolean", true)
.add("string", "hello, world!");
.add("string", "hello, world!");

String[] keys = v8Object.getKeys();

Expand Down Expand Up @@ -1842,13 +1842,20 @@ public void testSetWeakMakesObjectWeak() {

@SuppressWarnings("resource")
@Test
public void testClearWeakMakesObjectWeak() {
public void testClearWeakMakesObjectNonWeak() {
V8Value object = new V8Object(v8).setWeak().clearWeak();

assertFalse(object.isWeak());
object.close();
}

@SuppressWarnings("resource")
@Test
public void testReleaseWeakObjectDoesNotAffectReferenceCount() {
new V8Object(v8).setWeak().close();

assertEquals(0, v8.getObjectReferenceCount());

@Test
public void testConstructorNameFunction() {
v8.executeVoidScript("function Foo() {} var foo = new Foo();");
Expand Down