From a09a99c597ac204d776f30e139c8670aa14eed8b Mon Sep 17 00:00:00 2001
From: brianjlowe <brianjlowe@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 2 Dec 2011 20:14:50 +0000
Subject: [PATCH] NIHVIVO-3399 fixed bugs in label handling in
 ApplicationDaoJena

---
 .../mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java
index 32ecf8487..f20b1074d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java
@@ -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);