Changeset 29831 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

Timestamp:

2015-04-16T17:56:02+12:00 (9 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.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -532 +532 @@
         // commands are issued (and also don't need to do caching for this request)
         boolean should_cache = true;
-        if (action != null && action.equals(GSParams.SYSTEM_ACTION))
+        if (action != null && action.equals(GSParams.SYSTEM_ACTION) 
+            && !subaction.equals(GSXML.SYSTEM_TYPE_PING)) // don't 'clean' anything on a mere ping
         {
             should_cache = false;
@@ -563 +564 @@
             if (clean_all)
             {
+                // TODO
                 session_ids_table = new Hashtable<String, UserSessionCache>();
-                session.removeAttribute(GSXML.USER_SESSION_CACHE_ATT);
+                session.removeAttribute(GSXML.USER_SESSION_CACHE_ATT); // triggers valueUnbound(), which removes the session id from the session_ids_table
             }
             else