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

Making rebuild class group from site admin page synchronous NIHVIVO-3461

Browse source
This commit is contained in:
briancaruso 2011-12-08 22:30:35 +00:00
parent 6c9f87b163
commit 7ee7aedc2b
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java
View file

@ -49,6 +49,13 @@ public class BrowseController extends FreemarkerHttpServlet {
String message = null; String message = null;
String templateName = TEMPLATE_DEFAULT; String templateName = TEMPLATE_DEFAULT;
if ( vreq.getParameter("clearcache") != null ) {
//mainly for debugging
if( PolicyHelper.isAuthorizedForActions(vreq, new RebuildVClassGroupCache()) ){
clearGroupCache();
}
}
List<VClassGroup> groups = null; List<VClassGroup> groups = null;
VClassGroupCache vcgc = VClassGroupCache.getVClassGroupCache(getServletContext()); VClassGroupCache vcgc = VClassGroupCache.getVClassGroupCache(getServletContext());
if ( vcgc == null ) { if ( vcgc == null ) {
@ -68,17 +75,12 @@ public class BrowseController extends FreemarkerHttpServlet {
templateName = Template.TITLED_MESSAGE.toString(); templateName = Template.TITLED_MESSAGE.toString();
} }
if ( vreq.getParameter("clearcache") != null ) {
//mainly for debugging
if( PolicyHelper.isAuthorizedForActions(vreq, new RebuildVClassGroupCache()) ){
clearGroupCache();
}
}
return new TemplateResponseValues(templateName, body); return new TemplateResponseValues(templateName, body);
} }
protected void clearGroupCache(){ protected void clearGroupCache(){
VClassGroupCache.getVClassGroupCache(getServletContext()).requestCacheUpdate(); VClassGroupCache.getVClassGroupCache(getServletContext()).doSynchronousRebuild();
} }
} }

2
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java
View file

@ -178,7 +178,7 @@ public class VClassGroupCache implements IndexingEventListener {
return wdf.getVClassGroupDao(); return wdf.getVClassGroupDao();
} }
protected void doSynchronousRebuild(){ public void doSynchronousRebuild(){
//try to rebuild a couple times since the Solr server may not yet be up. //try to rebuild a couple times since the Solr server may not yet be up.
int attempts = 0; int attempts = 0;