You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by th...@apache.org on 2023/02/26 01:09:38 UTC

[commons-dbutils] 02/03: DBUTILS-150 Check for null before getting the annotations of a read method

This is an automated email from the ASF dual-hosted git repository.

thecarlhall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git

commit ea5c3d5bde7c35f08a0d84709d89d64fde1b4133
Author: Carl Hall <th...@apache.org>
AuthorDate: Sat Feb 25 19:43:45 2023 -0500

    DBUTILS-150 Check for null before getting the annotations of a read method
---
 src/main/java/org/apache/commons/dbutils/BeanProcessor.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
index 26610a0..5060d4c 100644
--- a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
+++ b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
@@ -463,8 +463,17 @@ public class BeanProcessor {
 
             for (int i = 0; i < props.length; i++) {
                 final PropertyDescriptor prop = props[i];
-                final Column column = prop.getReadMethod().getAnnotation(Column.class);
-                String propertyColumnName = null;
+                final Method reader = prop.getReadMethod();
+
+                // Check for @Column annotations as explicit marks
+                final Column column;
+                if (reader != null) {
+                    column = reader.getAnnotation(Column.class);
+                } else {
+                    column = null;
+                }
+
+                final String propertyColumnName;
                 if (column != null) {
                     propertyColumnName = column.name();
                 } else {