Skip to content

Commit f91c348

Browse files
committed
Merge branch '2.20' into 2.21
2 parents 785a851 + cea23b6 commit f91c348

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,8 +1026,8 @@ protected void _writeEnum(int index) throws IOException
10261026

10271027
protected void _reportEnumError(Object enumValue) throws IOException
10281028
{
1029-
_reportErrorF("No Enum '%s' found for property '%s'; valid values = %s"
1030-
+_currField.getEnumValues(), _currField.name, enumValue);
1029+
_reportErrorF("No Enum '%s' found for property '%s'; valid values = %s",
1030+
enumValue, _currField.name, _currField.getEnumValues());
10311031
}
10321032

10331033
/*

release-notes/VERSION-2.x

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ No changes since 2.19.1
125125
when creating parser with fixed buffer
126126
#651: (smile) Ensure Smile backend supports `StreamReadConstraints.maxTokenCount`
127127
#652: (cbor) Ensure CBOR backend supports `StreamReadConstraints.maxTokenCount`
128+
- Minor fix to `ProtobufGenerator._reportEnumError()` helper method
128129

129130
2.18.5 (27-Oct-2025)
130131

0 commit comments

Comments
 (0)