Nullsafe

jdaugherty · jdaugherty · commit 76e17c107a8f · 2025-02-19T23:54:02.000-05:00
diff --git a/grails-database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChange.groovy b/grails-database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChange.groovy
@@ -90,7 +90,7 @@ class GroovyChange extends AbstractChange {
     void load(ParsedNode parsedNode, ResourceAccessor resourceAccessor) throws ParsedNodeException {
         ctx = parsedNode.getChildValue(null, 'applicationContext', ApplicationContext)
         dataSourceName = parsedNode.getChildValue(null, DATA_SOURCE_NAME_KEY, String)
-        if (dataSourceName.startsWith("dataSource_")) {
+        if (dataSourceName?.startsWith("dataSource_")) {
             dataSourceName = dataSourceName.substring("dataSource_".length())
         }
 

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ class GroovyChange extends AbstractChange {`
`90`	`90`	`void load(ParsedNode parsedNode, ResourceAccessor resourceAccessor) throws ParsedNodeException {`
`91`	`91`	`ctx = parsedNode.getChildValue(null, 'applicationContext', ApplicationContext)`
`92`	`92`	`dataSourceName = parsedNode.getChildValue(null, DATA_SOURCE_NAME_KEY, String)`
`93`		`- if (dataSourceName.startsWith("dataSource_")) {`
	`93`	`+ if (dataSourceName?.startsWith("dataSource_")) {`
`94`	`94`	`dataSourceName = dataSourceName.substring("dataSource_".length())`
`95`	`95`	`}`
`96`	`96`