From 21c8d860873d3d0e1bf98e2f58d9c25129ba89cd Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Sat, 21 Nov 2009 12:46:50 +0000
Subject: [PATCH] fix: NPE on module code being NULL
SVN: 13462
---
.../cisd/dbmigration/DatabaseVersionLogDAO.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java
index 726c2cadd52..12d27069eb7 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java
@@ -87,8 +87,10 @@ public class DatabaseVersionLogDAO extends SimpleJdbcDaoSupport implements IData
logEntry.setRunStatusTimestamp(rs.getDate(RUN_STATUS_TIMESTAMP));
try
{
- logEntry.setModuleCode(new String(lobHandler.getBlobAsBytes(rs, MODULE_CODE),
- ENCODING));
+ final byte[] moduleCodeOrNull = lobHandler.getBlobAsBytes(rs, MODULE_CODE);
+ final String moduleCodeString =
+ (moduleCodeOrNull != null) ? new String(moduleCodeOrNull, ENCODING) : "";
+ logEntry.setModuleCode(moduleCodeString);
} catch (UnsupportedEncodingException ex)
{
throw new CheckedExceptionTunnel(ex);
@@ -166,8 +168,8 @@ public class DatabaseVersionLogDAO extends SimpleJdbcDaoSupport implements IData
ps.setString(2, moduleScript.getName());
ps.setString(3, LogEntry.RunStatus.START.toString());
ps.setTimestamp(4, new Timestamp(System.currentTimeMillis()));
- lobCreator
- .setBlobAsBytes(ps, 5, getAsByteArray(moduleScript.getContent()));
+ lobCreator.setBlobAsBytes(ps, 5, getAsByteArray(moduleScript
+ .getContent()));
}
};
template.execute("insert into " + DB_VERSION_LOG + " (" + DB_VERSION + "," + MODULE_NAME
--
GitLab