Changeset 31123 for main

Timestamp:

2016-11-17T16:34:09+13:00 (7 years ago)

Author:

ak19

Message:

Using the document editor, showed up that multiple metadata editing/deleting/adding was not guaranteed to take place in sequence. This code 1. ensures that the sequence is maintained by locking the collection while each individual metaaction takes place; 2. fixes an oversight in the code to do with reserving/locking the collection.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -317 +317 @@
         }
 
-        return runCommand(request, GS2PerlConstructor.MODIFY_METADATA_SERVER);
+        // wait until we can reserve the collection for processing
+        waitUntilReady(request);    
+        
+        // process
+        Element response = runCommand(request, GS2PerlConstructor.MODIFY_METADATA_SERVER);
+        
+        // release hold on collection
+        signalReady(request);
+        return response;
     }
 
@@ -892 +900 @@
         }
 
-        while (collectionOperationMap.get(collection) != null)
+        while (!checkCollectionIsNotBusy(collection)) // When the collection ceases to be busy, we place a hold on it
         {
             try
@@ -915 +923 @@
     }
 
+    // If collection is NOT busy, then reserve it
     protected synchronized boolean checkCollectionIsNotBusy(String collection)
     {