Merge pull request #42249 from HindujaB/fix-error-detail

Fix error detail throwing NPE for `cause()`
ballerina-platform · Mar 7, 2024 · 2ce4236 · 2ce4236
2 parents f3db542 + 3c8ebcd
commit 2ce4236
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BErrorType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BErrorType.java
@@ -19,6 +19,7 @@
 
 import io.ballerina.identifier.Utils;
 import io.ballerina.runtime.api.Module;
+import io.ballerina.runtime.api.PredefinedTypes;
 import io.ballerina.runtime.api.TypeTags;
 import io.ballerina.runtime.api.types.ErrorType;
 import io.ballerina.runtime.api.types.IntersectionType;
@@ -34,7 +35,7 @@
  */
 public class BErrorType extends BAnnotatableType implements ErrorType {
 
-    public Type detailType;
+    public Type detailType = PredefinedTypes.TYPE_ERROR_DETAIL;
     public BTypeIdSet typeIdSet;
     private IntersectionType intersectionType = null;
 

diff --git a/...na-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Errors.java b/...na-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Errors.java
@@ -130,4 +130,8 @@ public static BError getErrorWithNullDetailNegative2(BString msg) {
         ErrorType bErrorType = createErrorType(TypeConstants.ERROR, PredefinedTypes.TYPE_ERROR.getPackage());
         return ErrorCreator.createError(bErrorType, msg, null, null);
     }
+
+    public static BError getNullDetailError(BString msg) {
+        return ErrorCreator.createError(msg, new NullPointerException("cause for the error"));
+    }
 }
diff --git a/tests/jballerina-unit-test/src/test/resources/test-src/runtime/api/errors/main.bal b/tests/jballerina-unit-test/src/test/resources/test-src/runtime/api/errors/main.bal
@@ -75,6 +75,12 @@ public function main() {
 
     err = trap error_utils:getDistinctErrorWithNullDetailNegative2("error message");
     test:assertValueEqual(err.message(), "error message");
+
+    err = error_utils:getNullDetailError("error message");
+    error? c = err.cause();
+    test:assertValueEqual(c is (), false);
+    error cause = <error> c;
+    test:assertValueEqual(cause.message(), "cause for the error");
 }
 
 function testTypeIds() {

diff --git a/...t-test/src/test/resources/test-src/runtime/api/errors/modules/error_utils/error_utils.bal b/...t-test/src/test/resources/test-src/runtime/api/errors/modules/error_utils/error_utils.bal
@@ -73,3 +73,7 @@ public function getDistinctErrorWithEmptyDetailNegative2(string msg) returns err
 public function getDistinctErrorWithNullDetailNegative2(string msg) returns error = @java:Method {
     'class: "org.ballerinalang.nativeimpl.jvm.runtime.api.tests.Errors"
 } external;
+
+public function getNullDetailError(string msg) returns error = @java:Method {
+    'class: "org.ballerinalang.nativeimpl.jvm.runtime.api.tests.Errors"
+} external;