litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2769 (inference rebuild model should be cleared out at the end of an inference recompute)

Browse source
This commit is contained in:
stellamit 2011-06-24 15:29:15 +00:00
parent 851eb31119
commit aa14f34a60
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java
View file

@ -959,6 +959,9 @@ public class SimpleReasoner extends StatementListener {
} }
} catch (Exception e) { } catch (Exception e) {
log.error("Exception while recomputing ABox inference model", e); log.error("Exception while recomputing ABox inference model", e);
inferenceRebuildModel.removeAll(); // don't do this in the finally, it's needed in the case
// where there isn't an exception
return;
} finally { } finally {
aboxModel.leaveCriticalSection(); aboxModel.leaveCriticalSection();
tboxModel.leaveCriticalSection(); tboxModel.leaveCriticalSection();
@ -967,7 +970,7 @@ public class SimpleReasoner extends StatementListener {
// reflect the recomputed inferences into the application inference // reflect the recomputed inferences into the application inference
// model. // model.
inferenceRebuildModel.enterCriticalSection(Lock.READ); inferenceRebuildModel.enterCriticalSection(Lock.WRITE);
scratchpadModel.enterCriticalSection(Lock.WRITE); scratchpadModel.enterCriticalSection(Lock.WRITE);
log.info("Updating ABox inference model"); log.info("Updating ABox inference model");
// Remove everything from the current inference model that is not // Remove everything from the current inference model that is not
@ -1029,6 +1032,8 @@ public class SimpleReasoner extends StatementListener {
inferenceModel.leaveCriticalSection(); inferenceModel.leaveCriticalSection();
} }
} finally { } finally {
inferenceRebuildModel.removeAll();
scratchpadModel.removeAll();
inferenceRebuildModel.leaveCriticalSection(); inferenceRebuildModel.leaveCriticalSection();
scratchpadModel.leaveCriticalSection(); scratchpadModel.leaveCriticalSection();
} }