Skip to content

Commit 995b6a8

Browse files
committed
Merge branch '2.x' into 3.x
2 parents 581936e + 793fcf9 commit 995b6a8

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

src/main/java/tools/jackson/databind/deser/SettableAnyProperty.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,6 @@ public SettableAnyProperty withValueDeserializer(ValueDeserializer<Object> deser
452452
}
453453
}
454454

455-
456455
/**
457456
* [databind#562] Allow @JsonAnySetter on Creator constructor
458457
*/
@@ -490,7 +489,6 @@ protected void _set(DeserializationContext ctxt, Object instance, Object propNam
490489

491490
@Override
492491
public Object createParameterObject() { return new HashMap<>(); }
493-
494492
}
495493

496494
/**

0 commit comments

Comments
 (0)