From 262879f93b5fd87471c5b58b6f2a2e03c29342a3 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Mon, 7 Jan 2008 15:51:51 +0000
Subject: [PATCH] fix: wrong handling of corner cases (used to throw a
CheckedExceptionTunnel instead of a ConfigurationFailureException)
SVN: 3347
---
.../java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java | 4 ++--
.../cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java
index e66d3d0657b..1f7f23ec65b 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java
+++ b/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;
}
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java
index 337579a59a2..aa69a1e7f2e 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java
+++ b/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;
}
--
GitLab