Merge pull request #41612 from gabilang/fix-future-val-toString

Fix NPE with 'toString' method of FutureValue
ballerina-platform · Nov 9, 2023 · c5e3e0f · c5e3e0f
2 parents 024b80c + 91fa859
commit c5e3e0f
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/FutureValue.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/FutureValue.java
@@ -24,6 +24,7 @@
  import io.ballerina.runtime.api.values.BTypedesc;
  import io.ballerina.runtime.internal.scheduling.Strand;
  import io.ballerina.runtime.internal.types.BFutureType;
+ import io.ballerina.runtime.internal.util.StringUtils;
 
  import java.util.Map;
  import java.util.StringJoiner;
@@ -68,7 +69,7 @@ public String stringValue(BLink parent) {
          StringJoiner sj = new StringJoiner(",", "{", "}");
          sj.add("isDone:" + isDone);
          if (isDone) {
-             sj.add("result:" + result.toString());
+             sj.add("result:" + StringUtils.getStringVal(result, parent));
          }
          if (panic != null) {
              sj.add("panic:" + panic.getLocalizedMessage());

diff --git a/...rina-unit-test/src/test/java/org/ballerinalang/test/types/string/BStringToStringTest.java b/...rina-unit-test/src/test/java/org/ballerinalang/test/types/string/BStringToStringTest.java
@@ -19,8 +19,10 @@
 package org.ballerinalang.test.types.string;
 
 import org.ballerinalang.test.BCompileUtil;
+import org.ballerinalang.test.BRunUtil;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 /**
@@ -78,6 +80,16 @@ public void testArrayValueToString() {
         testAndAssert("testArrayValueToString", 30);
     }
 
+    @Test(dataProvider = "functionsToTestToString")
+    public void testFutureValueToString(String functionName) {
+        BRunUtil.invoke(result, functionName);
+    }
+
+    @DataProvider(name = "functionsToTestToString")
+    public String[] toStringTestFunctions() {
+        return new String[]{"testFutureValueToString", "testFutureValueToStringWithNilReturn"};
+    }
+
     @AfterClass
     public void tearDown() {
         result = null;

diff --git a/...s/jballerina-unit-test/src/test/resources/test-src/types/string/bstring-tostring-test.bal b/...s/jballerina-unit-test/src/test/resources/test-src/types/string/bstring-tostring-test.bal
@@ -13,7 +13,10 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+
+import ballerina/lang.runtime;
 import ballerina/lang.value;
+import ballerina/test;
 
 function testDecimalToString() returns int {
     decimal res3 = 8;
@@ -74,3 +77,23 @@ function testArrayValueToString() returns int {
     string[][] arr2 = [["h🤷llo", "h🤷llo", "h🤷llo"], ["h🤷llo", "h🤷llo", "h🤷llo"]];
     return arr2[0].toString().length() + arr2[0][1].toString().length();
 }
+
+function testFutureValueToString() {
+    future<boolean> f = start isEven(2);
+    runtime:sleep(1);
+    string s = f.toString();
+    test:assertEquals(s, "future {isDone:true,result:true}");
+}
+
+function isEven(int n) returns boolean {
+   return n % 2 == 0;
+}
+
+function testFutureValueToStringWithNilReturn() {
+    future<()> f = start addName();
+    runtime:sleep(1);
+    string s = f.toString();
+    test:assertEquals(s, "future {isDone:true,result:}");
+}
+
+function addName() {}