honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix npe

This commit is contained in:
Jason Roberts 2021-09-24 09:46:48 -04:00
parent 79a3fb19b2
commit 4c28b1b552
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_6_0/3031-index-migration-npe.yaml Normal file
View File

@ -0,0 +1,5 @@
---
type: fix
issue: 3031
jira: SMILE-3178
title: "Fixes a bug that was causing a null pointer exception to be thrown during database migrations that add or drop indexes."

10
hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/JdbcUtils.java
View File

@ -61,6 +61,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
public class JdbcUtils {
private static final Logger ourLog = LoggerFactory.getLogger(JdbcUtils.class);
@ -86,7 +87,6 @@ public class JdbcUtils {
while (indexes.next()) {
ourLog.debug("*** Next index: {}", new ColumnMapRowMapper().mapRow(indexes, 0));
String indexName = indexes.getString("INDEX_NAME");
indexName = indexName.toUpperCase(Locale.US);
indexNames.add(indexName);
}
@ -94,11 +94,15 @@ public class JdbcUtils {
while (indexes.next()) {
ourLog.debug("*** Next index: {}", new ColumnMapRowMapper().mapRow(indexes, 0));
String indexName = indexes.getString("INDEX_NAME");
indexName = indexName.toUpperCase(Locale.US);
indexNames.add(indexName);
}
indexNames.removeIf(i -> i == null);
indexNames = indexNames
.stream()
.filter(Objects::nonNull) // filter out the nulls first
.map(s -> s.toUpperCase(Locale.US)) // then convert the non-null entries to upper case
.collect(Collectors.toSet());
return indexNames;
} catch (SQLException e) {