Fix NPE in conditional Flyway repairs #1044
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conditional check for `tryToMigrateIfMysql8Migration` throws NPE when run against a Spring Boot 1 database: ```log Caused by: java.lang.NullPointerException: Cannot invoke "org.flywaydb.core.api.MigrationInfo.getVersion()" because the return value of "org.flywaydb.core.api.MigrationInfoService.current()" is null at com.box.l10n.mojito.FlyWayConfig.lambda$0(FlyWayConfig.java:50) at org.springframework.boot.autoconfigure.flyway.FlywayMigrationInitializer.afterPropertiesSet(FlywayMigrationInitializer.java:62) at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1815) at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1764) ... 16 common frames omitted ``` even though the first thrown `FlywayException` should actually be handled by `tryToMigrateIfSpringMigration`: ```log org.flywaydb.core.api.FlywayException: Found non-empty schema(s) `mojito` but no schema history table. Use baseline() or set baselineOnMigrate to true to initialize the schema history table. at org.flywaydb.core.Flyway.lambda$migrate$0(Flyway.java:178) at org.flywaydb.core.FlywayExecutor.execute(FlywayExecutor.java:196) at org.flywaydb.core.Flyway.migrate(Flyway.java:140) at com.box.l10n.mojito.FlyWayConfig.lambda$0(FlyWayConfig.java:46) at org.springframework.boot.autoconfigure.flyway.FlywayMigrationInitializer.afterPropertiesSet(FlywayMigrationInitializer.java:62) at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1815) at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1764) at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:596) ``` This commit: * changes order of migration attempts (SpringMigration first) * changes conditional MySQL8 migration to first check exception text, then attempt to retrieve schema version
wadimw
added
the
upstream-patched
ehoogerbeets
approved these changes
Dec 19, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Conditional check for
tryToMigrateIfMysql8Migrationthrows NPE when run against a Spring Boot 1 database:even though the first thrown
FlywayExceptionshould actually be handled bytryToMigrateIfSpringMigration:This commit: