Fix for SF Bug #1571645 NullPointerException possible in review.jsp

git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_5_x@3377 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Claudia Juergen
2009-01-19 12:29:41 +00:00
parent 050dbe280f
commit 9cdebe49f6
2 changed files with 8 additions and 3 deletions

View File

@@ -158,7 +158,11 @@
String storedVal = values[i].value; String storedVal = values[i].value;
String displayVal = inputs[z].getDisplayString(pairsName, String displayVal = inputs[z].getDisplayString(pairsName,
storedVal); storedVal);
row.append(Utils.addEntities(displayVal)); if (displayVal == null || displayVal.equals(""))
{
// use the stored value as label rather than null
row.append(Utils.addEntities(storedVal));
}
} }
else if (inputType.equals("qualdrop_value")) else if (inputType.equals("qualdrop_value"))
{ {
@@ -167,9 +171,9 @@
String displayQual = inputs[z].getDisplayString(pairsName, String displayQual = inputs[z].getDisplayString(pairsName,
qual); qual);
String displayValue = Utils.addEntities(values[i].value); String displayValue = Utils.addEntities(values[i].value);
if (displayQual != null) if (displayValue != null)
{ {
row.append(displayQual + ":" + displayValue); row.append((displayQual == null ? qual : displayQual) + ":" + displayValue);
} }
} }
else else

View File

@@ -31,6 +31,7 @@
- Fix for SF Bug #1968082 SWORD Service Document fails if Collection is untitled - Fix for SF Bug #1968082 SWORD Service Document fails if Collection is untitled
- Fix for SF Bug #2493794 Hardcoded Strings in DSQuery - Fix for SF Bug #2493794 Hardcoded Strings in DSQuery
- Fix for SF Bug #1745573 Itemmap-browse.jsp throws Exception on items without date - Fix for SF Bug #1745573 Itemmap-browse.jsp throws Exception on items without date
- Fix for SF Bug #1571645 NullPointerException possible in review.jsp
(Elliot Metsger) (Elliot Metsger)
- Patch for SF bug #2016130 checksum checker can not retrieve very large bitstream - Patch for SF bug #2016130 checksum checker can not retrieve very large bitstream