fix: wrong handling of corner cases (used to throw a CheckedExceptionTunnel...

fix: wrong handling of corner cases (used to throw a CheckedExceptionTunnel instead of a ConfigurationFailureException)

SVN: 3347

dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java

@@ -135,13 +135,13 @@ public class H2AdminDAO extends SimpleJdbcDaoSupport implements IDatabaseAdminDA
             throws ConfigurationFailureException
     {
         final File scriptFile = new File(dumpFolder, prefix + "-" + version + SQL_FILE_TYPE);
-        final Script script = new Script(scriptFile.getPath(), FileUtilities.loadToString(scriptFile), version);
-        if (script == null)
+        if (scriptFile.canRead() == false)
         {
             final String message = "No " + prefix + " script found for version " + version;
             operationLog.error(message);
             throw new ConfigurationFailureException(message);
         }
+        final Script script = new Script(scriptFile.getPath(), FileUtilities.loadToString(scriptFile), version);
         return script;
     }
 

dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java

@@ -183,13 +183,13 @@ public class PostgreSQLAdminDAO extends SimpleJdbcDaoSupport implements IDatabas
             throws ConfigurationFailureException
     {
         final File scriptFile = new File(dumpFolder, prefix + "-" + version + SQL_FILE_TYPE);
-        final Script script = new Script(scriptFile.getPath(), FileUtilities.loadToString(scriptFile), version);
-        if (script == null)
+        if (scriptFile.canRead() == false)
         {
             final String message = "No " + prefix + " script found for version " + version;
             operationLog.error(message);
             throw new ConfigurationFailureException(message);
         }
+        final Script script = new Script(scriptFile.getPath(), FileUtilities.loadToString(scriptFile), version);
         return script;
     }