hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-19 07:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-734] Fix parsing problems from last check-in

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5713 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Graham Triggs
2010-11-02 17:29:31 +00:00
parent 114aee128d
commit d7fa5958b0
2 changed files with 70 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java
View File

@@ -1197,12 +1197,6 @@ public class DatabaseManager
String name = meta.getColumnName(i); String name = meta.getColumnName(i);
int jdbctype = meta.getColumnType(i); int jdbctype = meta.getColumnType(i);
if (results.wasNull())
{
row.setColumnNull(name);
}
else
{
switch (jdbctype) switch (jdbctype)
{ {
case Types.BIT: case Types.BIT:
@@ -1285,6 +1279,11 @@ public class DatabaseManager
default: default:
throw new IllegalArgumentException("Unsupported JDBC type: " + jdbctype); throw new IllegalArgumentException("Unsupported JDBC type: " + jdbctype);
} }
// Determines if the last column was null, and sets the tablerow accordingly
if (results.wasNull())
{
row.setColumnNull(name);
} }
} }

2
dspace-api/src/main/java/org/dspace/storage/rdbms/TableRow.java
View File

@@ -320,7 +320,7 @@ public class TableRow
throw new IllegalArgumentException("No such column " + column); throw new IllegalArgumentException("No such column " + column);
} }
if (isColumnNull(column)) if (isColumnNullCanonicalized(column))
{ {
return null; return null;
} }