VIVO-82 Use ModelAccess to get or set the JenaOntModel (Union Full model)

This commit is contained in:
j2blake 2013-05-17 12:37:49 -04:00
parent 4e4384bd3e
commit 6a4c7ba6fc
4 changed files with 4 additions and 4 deletions

View file

@ -55,7 +55,7 @@
} }
String contextId = sesameProperties.getProperty(SESAME_CONTEXT); String contextId = sesameProperties.getProperty(SESAME_CONTEXT);
Model fullModel = ModelAccess.on(getServletContext).getJenaOntModel(); Model fullModel = ModelAccess.on(getServletContext()).getJenaOntModel();
// Copy the model to avoid locking the main model during sync. Assumes enough memory. // Copy the model to avoid locking the main model during sync. Assumes enough memory.
Model copyModel = ModelFactory.createDefaultModel(); Model copyModel = ModelFactory.createDefaultModel();
fullModel.enterCriticalSection(Lock.READ); fullModel.enterCriticalSection(Lock.READ);

View file

@ -24,7 +24,7 @@
<select name="workflowURI"> <select name="workflowURI">
<% <%
OntModel jenaOntModel = ModelAccess.on(getServletContext().getJenaOntModel(); OntModel jenaOntModel = ModelAccess.on(getServletContext()).getJenaOntModel();
jenaOntModel.enterCriticalSection(Lock.READ); jenaOntModel.enterCriticalSection(Lock.READ);
try { try {
List savedQueries = (List) request.getAttribute("workflows"); List savedQueries = (List) request.getAttribute("workflows");

View file

@ -47,7 +47,7 @@
<h3>SPARQL Query <select name="savedQuery"> <h3>SPARQL Query <select name="savedQuery">
<option value="">select saved query</option> <option value="">select saved query</option>
<% <%
OntModel jenaOntModel = ModelAccess.on(getServletContext().getJenaOntModel(); OntModel jenaOntModel = ModelAccess.on(getServletContext()).getJenaOntModel();
jenaOntModel.enterCriticalSection(Lock.READ); jenaOntModel.enterCriticalSection(Lock.READ);
try { try {
List savedQueries = (List) request.getAttribute("savedQueries"); List savedQueries = (List) request.getAttribute("savedQueries");

View file

@ -26,7 +26,7 @@
<select name="workflowStepURI"> <select name="workflowStepURI">
<% <%
OntModel jenaOntModel = ModelAccess.on(getServletContext().getJenaOntModel(); OntModel jenaOntModel = ModelAccess.on(getServletContext()).getJenaOntModel();
jenaOntModel.enterCriticalSection(Lock.READ); jenaOntModel.enterCriticalSection(Lock.READ);
try { try {
List workflowSteps = (List) request.getAttribute("workflowSteps"); List workflowSteps = (List) request.getAttribute("workflowSteps");