Merge pull request #101 from stephlag/master

Fix problem on H2 when trying to use forceReleaseLocks
liquibase · Feb 5, 2013 · a720582 · a720582
2 parents 50f1c7e + d4c6d1b
commit a720582
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/liquibase-core/src/main/java/liquibase/database/AbstractJdbcDatabase.java b/liquibase-core/src/main/java/liquibase/database/AbstractJdbcDatabase.java
@@ -615,12 +615,14 @@ public void checkDatabaseChangeLogTable(boolean updateExistingNullChecksums, Dat
             boolean hasLiquibase = changeLogTable.getColumn("LIQUIBASE") != null;
             boolean liquibaseColumnNotRightSize = false;
             if (!connection.getDatabaseProductName().equals("SQLite")) {
-                liquibaseColumnNotRightSize = changeLogTable.getColumn("LIQUIBASE").getType().getColumnSize() != 20;
+                Integer columnSize = changeLogTable.getColumn("LIQUIBASE").getType().getColumnSize();
+                liquibaseColumnNotRightSize =columnSize!=null &&  columnSize != 20;
             }
             boolean hasOrderExecuted = changeLogTable.getColumn("ORDEREXECUTED") != null;
             boolean checksumNotRightSize = false;
             if (!connection.getDatabaseProductName().equals("SQLite")) {
-                checksumNotRightSize = changeLogTable.getColumn("MD5SUM").getType().getColumnSize() != 35;
+                Integer columnSize = changeLogTable.getColumn("MD5SUM").getType().getColumnSize();
+                checksumNotRightSize = columnSize!=null && columnSize  != 35;
             }
             boolean hasExecTypeColumn = changeLogTable.getColumn("EXECTYPE") != null;