apply 6x commits

This commit is contained in:
Terry W Brady
2017-01-31 15:02:55 -08:00
parent 1af506d35f
commit 9e84117557

View File

@@ -181,6 +181,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
{
return;
}
initSolrYearCores();
try
@@ -220,6 +221,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
if (solr == null || locationService == null) {
return;
}
initSolrYearCores();
try {
SolrInputDocument doc1 = getCommonSolrDoc(dspaceObject, ip, userAgent, xforwardedfor,
@@ -247,7 +249,6 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
}
}
/**
* Returns a solr input document containing common information about the statistics
* regardless if we are logging a search or a view of a DSpace object
@@ -445,6 +446,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
{
SolrInputDocument solrDoc = getCommonSolrDoc(resultObject, request, currentUser);
if (solrDoc == null) return;
initSolrYearCores();
for (String query : queries) {
solrDoc.addField("query", query);
@@ -491,6 +493,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
@Override
public void postWorkflow(UsageWorkflowEvent usageWorkflowEvent) throws SQLException {
initSolrYearCores();
try {
SolrInputDocument solrDoc = getCommonSolrDoc(usageWorkflowEvent.getObject(), null, null);