From 1f786920a023d2a5da1c6362a9f2d253fb7fb49a Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Thu, 14 Jul 2011 19:27:56 +0000 Subject: [PATCH] NIHVIVO-2907 fixed bug in Vitro-only class and property group creation --- .../webapp/dao/jena/IndividualDaoJena.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java index ce8726869..ec944548f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java @@ -217,19 +217,10 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { String entURI = null; - Resource cls = null; - OntModel tboxModel = getOntModelSelector().getTBoxModel(); - tboxModel.enterCriticalSection(Lock.READ); - try { - try { - cls = tboxModel.getOntClass(ent.getVClassURI()); - } catch (Exception e) {} - if (cls==null) { - cls = OWL.Thing; // This assumes we want OWL-DL compatibility. Individuals cannot be untyped. - } - } finally { - tboxModel.leaveCriticalSection(); - } + Resource cls = (ent.getVClassURI() != null) + ? ontModel.getResource(ent.getVClassURI()) + : OWL.Thing; // This assumes we want OWL-DL compatibility. + // Individuals cannot be untyped. ontModel.enterCriticalSection(Lock.WRITE); try {