Changeset 7601 for trunk/gli/src/org/greenstone/gatherer/cdm

Timestamp:

2004-06-17T11:08:27+12:00 (20 years ago)

Author:

mdewsnip

Message:

Have hopefully (and finally!) fixed the nasty race conditions with the local library server (causing, for example, the "could not remove index directory" problems). The Gatherer.configServer function performs an HTTP request, but returns before the local library processing is actually complete.

This can be solved by calling the configServer function again, with an empty string argument -- this extra request will not return until the first (real) request is processed.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/CollectionDesignManager.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionDesignManager.java

@@ -214 +214 @@
       // Release the collection
       Gatherer.self.configServer(GSDLSiteConfig.RELEASE_COMMAND + Gatherer.c_man.getCollection().getName());
-     collection_released = true;
+      // This is very important -- it ensures that the above command has finished
+      Gatherer.self.configServer("");
+      collection_released = true;
       }
 
@@ -225 +227 @@
       // Then re-add it to force format commands to be processed
       Gatherer.self.configServer(GSDLSiteConfig.ADD_COMMAND + Gatherer.c_man.getCollection().getName());
+      // This is very important -- it ensures that the above command has finished
+      Gatherer.self.configServer("");
      // Unset formats changed
      format_manager.setFormatsChanged(false);