NIHVIVO-3399 fixed bugs in label handling in ApplicationDaoJena

This commit is contained in:
brianjlowe 2011-12-02 20:14:50 +00:00
parent 5d7f8486b8
commit a09a99c597

View file

@ -52,8 +52,10 @@ public class ApplicationDaoJena extends JenaBaseDao implements ApplicationDao {
}
ontModel.enterCriticalSection(Lock.READ);
try {
application.setApplicationName(appInd.getLabel(null));
String appName = appInd.getLabel(null);
if (appName != null) {
application.setApplicationName(appName);
} // else leave as default
application.setAboutText(getPropertyStringValue(
appInd, APPLICATION_ABOUTTEXT));
application.setAcknowledgeText(getPropertyStringValue(
@ -82,7 +84,7 @@ public class ApplicationDaoJena extends JenaBaseDao implements ApplicationDao {
Individual appInd = ontModel.getIndividual(
getApplicationResourceURI());
if (appInd == null) {
appInd = getOntModel().createIndividual(
appInd = ontModel.createIndividual(
getApplicationResourceURI(), PORTAL);
}
ontModel.enterCriticalSection(Lock.WRITE);