hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 15:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

check for null values (in order to avoid NPEs due to incorrect configuration)

Browse Source
This commit is contained in:
Kostas Stamatis
2014-10-27 14:22:29 +02:00
parent 02bbcd2b8a
commit 34cc462b7f
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dspace-jspui/src/main/java/org/dspace/app/webui/util/UIUtil.java
View File

@@ -510,12 +510,21 @@ public class UIUtil extends Util
String mark = markType.replace("mark_", ""); String mark = markType.replace("mark_", "");
ItemMarkingInfo markInfo = new DSpace() ItemMarkingExtractor markingExtractor = new DSpace()
.getServiceManager() .getServiceManager()
.getServiceByName( .getServiceByName(
ItemMarkingExtractor.class.getName()+"."+mark, ItemMarkingExtractor.class.getName()+"."+mark,
ItemMarkingExtractor.class) ItemMarkingExtractor.class);
.getItemMarkingInfo(c, item);
if (markingExtractor == null){ // In case we cannot find the corresponding extractor (strategy) in xml beans
return "";
}
ItemMarkingInfo markInfo = markingExtractor.getItemMarkingInfo(c, item);
if (markInfo == null){
return "";
}
StringBuffer markFrag = new StringBuffer(); StringBuffer markFrag = new StringBuffer();
@@ -526,7 +535,7 @@ public class UIUtil extends Util
String markLink = markInfo.getLink(); String markLink = markInfo.getLink();
if (markInfo!=null && markInfo.getImageName()!=null){ if (markInfo.getImageName()!=null){
//Link //Link
if (StringUtils.isNotEmpty(markLink)){ if (StringUtils.isNotEmpty(markLink)){
@@ -549,7 +558,7 @@ public class UIUtil extends Util
markFrag.append("</a>"); markFrag.append("</a>");
} }
} }
else if (markInfo!=null && markInfo.getClassInfo()!=null){ else if (markInfo.getClassInfo()!=null){
//Link //Link
if (StringUtils.isNotEmpty(markLink)){ if (StringUtils.isNotEmpty(markLink)){
markFrag.append("<a href=\"") markFrag.append("<a href=\"")