From 6babebfec5956af0359a22f64fc99cabfc3c0bec Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Fri, 31 Jul 2015 21:28:36 +1200 Subject: [PATCH] No effective change - code cleanup - simplify if --- .../server/deploy/BeanDescriptorManager.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java index a6d294c0c..9dc3d8491 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -31,6 +31,7 @@ import com.avaje.ebeaninternal.server.properties.BeanPropertyInfo; import com.avaje.ebeaninternal.server.properties.BeanPropertyInfoFactory; import com.avaje.ebeaninternal.server.properties.EnhanceBeanPropertyInfoFactory; import com.avaje.ebeaninternal.server.type.TypeManager; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1393,11 +1394,9 @@ public class BeanDescriptorManager implements BeanDescriptorMap { } Field[] fields = beanClass.getDeclaredFields(); for (Field field : fields) { - if (Modifier.isStatic(field.getModifiers()) || Modifier.isTransient(field.getModifiers())) { - // ignore this field - } else if (field.isAnnotationPresent(Transient.class)) { - // ignore this field - } else { + if (!Modifier.isStatic(field.getModifiers()) + && !Modifier.isTransient(field.getModifiers()) + && !field.isAnnotationPresent(Transient.class)) { return false; } }