Support empty ArrayBuffers

If an ArrayBuffer was empty, we were returning null. We now return an empty ArrayBuffer. Change-Id: Ie9014e81d4f46261024c906548d6da058a04babe
eclipsesource · Oct 12, 2018 · 319816a · 319816a
1 parent ac976e7
commit 319816a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/jni/com_eclipsesource_v8_V8Impl.cpp b/jni/com_eclipsesource_v8_V8Impl.cpp
@@ -2018,7 +2018,12 @@ jobject getResult(JNIEnv *env, jobject &v8, jlong v8RuntimePtr, Handle<Value> &r
   else if (result->IsArrayBuffer()) {
     ArrayBuffer* arrayBuffer = ArrayBuffer::Cast(*result);
     if ( arrayBuffer->GetContents().Data() == NULL ) {
-      return NULL;
+      jobject byteBuffer = env->NewDirectByteBuffer(arrayBuffer->GetContents().Data(), 0);
+      jobject objectResult = env->NewObject(v8ArrayBufferCls, v8ArrayBufferInitMethodID, v8, byteBuffer);
+      jlong resultHandle = getHandle(env, objectResult);
+      v8::Isolate* isolate = reinterpret_cast<V8Runtime*>(v8RuntimePtr)->isolate;
+      reinterpret_cast<Persistent<Object>*>(resultHandle)->Reset(isolate, result->ToObject(isolate));
+      return objectResult;
     }
     jobject byteBuffer = env->NewDirectByteBuffer(arrayBuffer->GetContents().Data(), arrayBuffer->ByteLength());
     jobject objectResult = env->NewObject(v8ArrayBufferCls, v8ArrayBufferInitMethodID, v8, byteBuffer);

diff --git a/src/test/java/com/eclipsesource/v8/V8ArrayBufferTest.java b/src/test/java/com/eclipsesource/v8/V8ArrayBufferTest.java
@@ -18,7 +18,6 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class V8ArrayBufferTest {
@@ -43,7 +42,6 @@ public void tearDown() {
     }
 
     @Test
-    @Ignore
     public void testEmptyArrayBufferReturned() {
         V8ArrayBuffer arrayBuffer = (V8ArrayBuffer) v8.executeScript("new ArrayBuffer(0);");