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.

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

Fix error detail throwing NPE for cause() #42249

Merged
merged 4 commits into from
Mar 7, 2024
Merged

Fix error detail throwing NPE for cause() #42249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1960a1
Add detail type
HindujaB Feb 29, 2024
c7e1615
Add API test
HindujaB Feb 29, 2024
4dbe4b0
Merge branch 'master' of github.com:ballerina-platform/ballerina-lang…
HindujaB Mar 5, 2024
3c8ebcd
Remove unnecessary comment
HindujaB Mar 5, 2024
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
3 changes: 2 additions & 1 deletion bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BErrorType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
4 changes: 4 additions & 0 deletions ...na-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Errors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}
}
6 changes: 6 additions & 0 deletions tests/jballerina-unit-test/src/test/resources/test-src/runtime/api/errors/main.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 4 additions & 0 deletions ...t-test/src/test/resources/test-src/runtime/api/errors/modules/error_utils/error_utils.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Loading