commit e97220ed67158a959a4a3836017111b6930fe263
author Carl Hall <thecarlhall@apache.org> Sun Oct 20 21:56:54 2019 -0700
committer Carl Hall <thecarlhall@apache.org> Sun Oct 20 21:56:54 2019 -0700
tree cfb964154dec2822a3f718c5a7aaeb9b9179f4bb
parent 2ed6a127bd830adbe2b385d9ee62ead2f0e61fc5

Dedupe property name logic

A bit of logic was copied from a previous iteration.  This commit
reduces the logic to just picking a name source.

src/main/java/org/apache/commons/dbutils/BeanProcessor.java

diff --git a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
index ada9009..6fdf8fb 100644
--- a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
+++ b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
@@ -478,12 +478,13 @@
 
                 PropertyDescriptor prop = props[i];
                 Column column = prop.getReadMethod().getAnnotation(Column.class);
+                String propertyColumnName = null;
                 if (column != null) {
-                    if (propertyName.equalsIgnoreCase(column.name())){
-                        columnToProperty[col] = i;
-                        break;
-                    }
-                } else if (propertyName.equalsIgnoreCase(prop.getName())) {
+                    propertyColumnName = column.name();
+                } else {
+                    propertyColumnName = prop.getName();
+                }
+                if (propertyName.equalsIgnoreCase(propertyColumnName)) {
                     columnToProperty[col] = i;
                     break;
                 }