Minor tweak to #3305 impl

FasterXML · Dec 11, 2021 · 86dd187 · 86dd187
1 parent 528c656
commit 86dd187
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/BeanSerializerFactory.java b/src/main/java/com/fasterxml/jackson/databind/ser/BeanSerializerFactory.java
@@ -688,18 +688,19 @@ protected List<BeanPropertyWriter> filterBeanProperties(SerializationConfig conf
     protected List<BeanPropertyWriter> filterUnwantedJDKProperties(SerializationConfig config,
             BeanDescription beanDesc, List<BeanPropertyWriter> props)
     {
-        // First, only consider something that implement `CharSequence`
+        // First, only consider something that implements `CharSequence`
         if (beanDesc.getType().isTypeOrSubTypeOf(CharSequence.class)) {
-            Iterator<BeanPropertyWriter> it = props.iterator();
-            while (it.hasNext()) {
-                BeanPropertyWriter prop = it.next();
+            // And only has a single property from "isEmpty()" default method
+            if (props.size() == 1) {
+                BeanPropertyWriter prop = props.get(0);
                 // And only remove property induced by `isEmpty()` method declared
                 // in `CharSequence` (default implementation)
+                // (could in theory relax this limit, probably but... should be fine)
                 AnnotatedMember m = prop.getMember();
                 if ((m instanceof AnnotatedMethod)
                         && "isEmpty".equals(m.getName())
                         && m.getDeclaringClass() == CharSequence.class) {
-                    it.remove();
+                    props.remove(0);
                 }
             }
         }