Skip to content

Fix NPE on adding new columns in the tables #12464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
harikrishna-patnala wants to merge 1 commit into
base: 4.20
Choose a base branch
from
+12 −4
Open

Fix NPE on adding new columns in the tables #12464

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Element;
import org.springframework.util.ClassUtils;

/**
* GenericDaoBase is a simple way to implement DAOs. It DOES NOT
Expand Down Expand Up @@ -2047,16 +2048,23 @@ public boolean unremove(ID id) {

@DB()
protected void setField(final Object entity, final ResultSet rs, ResultSetMetaData meta, final int index) throws SQLException {
Attribute attr = _allColumns.get(new Pair<String, String>(meta.getTableName(index), meta.getColumnName(index)));
String tableName = meta.getTableName(index);
String columnName = meta.getColumnName(index);
Attribute attr = _allColumns.get(new Pair<>(tableName, columnName));
if (attr == null) {
// work around for mysql bug to return original table name instead of view name in db view case
Table tbl = entity.getClass().getSuperclass().getAnnotation(Table.class);
if (tbl != null) {
attr = _allColumns.get(new Pair<String, String>(tbl.name(), meta.getColumnLabel(index)));
attr = _allColumns.get(new Pair<>(tbl.name(), meta.getColumnLabel(index)));
}
}
assert (attr != null) : "How come I can't find " + meta.getCatalogName(index) + "." + meta.getColumnName(index);
setField(entity, attr.field, rs, index);
assert (attr != null) : "How come I can't find " + tableName + "." + columnName;
Copy link
Contributor

@DaanHoogland DaanHoogland Jan 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can remove the assert

if(attr == null) {
logger.warn(String.format("Failed to find attribute in the entity %s to map column %s.%s (%s)",
ClassUtils.getUserClass(entity).getSimpleName(), tableName, columnName));
} else {
setField(entity, attr.field, rs, index);
}
}

@Override
Expand Down
Loading