Changeset 29831

Show
Ignore:
Timestamp:
16.04.2015 17:56:02 (5 years ago)
Author:
ak19
Message:

Dr Bainbridge fixed the bug in a solr collection where upon rebuilding a solr collection, the 2nd search results page is empty, but this does not happen if the server had merely been restarted. What was happening, was that the user session table was being cleared as a side-effect on the pings issued by activate.pl when activating and deactivating a rebuilt solr collection.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

    r28972 r29831  
    532532        // commands are issued (and also don't need to do caching for this request) 
    533533        boolean should_cache = true; 
    534         if (action != null && action.equals(GSParams.SYSTEM_ACTION)) 
     534        if (action != null && action.equals(GSParams.SYSTEM_ACTION)  
     535            && !subaction.equals(GSXML.SYSTEM_TYPE_PING)) // don't 'clean' anything on a mere ping 
    535536        { 
    536537            should_cache = false; 
     
    563564            if (clean_all) 
    564565            { 
     566                // TODO 
    565567                session_ids_table = new Hashtable<String, UserSessionCache>(); 
    566                 session.removeAttribute(GSXML.USER_SESSION_CACHE_ATT); 
     568                session.removeAttribute(GSXML.USER_SESSION_CACHE_ATT); // triggers valueUnbound(), which removes the session id from the session_ids_table 
    567569            } 
    568570            else