Skip to content

fix: return empty PAnnotationValue for NullAnnotation to prevent NPE #14135

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
waterWang wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −1
Open

fix: return empty PAnnotationValue for NullAnnotation to prevent NPE #14135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion .../main/java/com/navercorp/pinpoint/profiler/context/grpc/mapper/AnnotationValueMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,9 @@ default PBytesStringStringValue.Builder getBytesStringStringBuilder() {
@ToPAnnotationValue
default PAnnotationValue map(Annotation<?> annotation) {
if (annotation instanceof NullAnnotation) {
return null;
// Return an empty PAnnotationValue instead of null to avoid NPE in callers
// that unconditionally set the result on a PAnnotation.Builder.
return getAnnotationBuilder().build();
}
return mapNonNull(annotation);
}
Expand Down
Loading