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

Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6

Browse source
This commit is contained in:
hudajkhan 2013-11-11 18:28:30 -05:00
commit 815215fbd7
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java
View file

@ -346,7 +346,9 @@ public class KnowledgeBaseUpdater {
}
public static boolean isUpdatableABoxGraph(String graphName) {
return (!graphName.contains("tbox") && !graphName.contains("filegraph"));
return (graphName != null && !graphName.contains("tbox")
&& !graphName.contains("filegraph")
&& !graphName.contains("x-arq:UnionGraph"));
}
/**

2
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
View file

@ -141,7 +141,7 @@ public class UpdateKnowledgeBase implements ServletContextListener {
KnowledgeBaseUpdater ontologyUpdater = new KnowledgeBaseUpdater(settings);
boolean requiredUpdate = ontologyUpdater.updateRequired(ctx);
if(!JenaDataSourceSetupBase.isFirstStartup()) {
if(requiredUpdate && !JenaDataSourceSetupBase.isFirstStartup()) {
try {
ctx.setAttribute(KBM_REQURIED_AT_STARTUP, Boolean.TRUE);
migrationChangesMade = ontologyUpdater.update(ctx);