Changeset 31125 for main

Timestamp:

2016-11-18T13:32:02+13:00 (7 years ago)

Author:

ak19

Message:

Experimental fix for concurrent access issue when using document editor to modify metadata. Need to commit now in order to test on other win machine where the race condition manifests in the binary. That Win machine doesn't have Vis Studio for compiling, and compiling just the core (Java) is insufficient as the tomcat won't even start after that perhaps because other parts were no compiled up.

File:

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

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

@@ -318 +318 @@
         }
 
+        
         // wait until we can reserve the collection for processing
         waitUntilReady(request);    
         
-        // process
+        logger.error("@@@ RESERVED");
+        
+        // process
         Element response = runCommand(request, GS2PerlConstructor.MODIFY_METADATA_SERVER);
+        
+        if (response.getElementsByTagName(GSXML.ERROR_ELEM).getLength() <= 0) // if no errors, wait for process to finish
+        {
+            logger.error("@@@ NO ERRORS");
+            
+            Element statusElem = (Element) response.getElementsByTagName(GSXML.STATUS_ELEM).item(0);
+            String id = statusElem.getAttribute("pid");
+            logger.error("@@@ GOT PID: " + id);
+            
+            GS2PerlListener currentListener = this.listeners.get(id);
+            int statusCode = currentListener.getStatus();
+            while (!GSStatus.isCompleted(statusCode))
+            {
+                // wait for the process, and keep checking the status code
+                // there is probably a better way to do this.
+                try
+                {
+                    logger.error("@@@ WAITING");
+                    Thread.currentThread().sleep(100);
+                }
+                catch (Exception e)
+                { // ignore
+                }
+                statusCode = currentListener.getStatus();
+            }       
+        }
+        
+        else {
+            logger.error("@@@ GOT ERROR");          
+        }
+        
+        logger.error("@@@ RELEASING HOLD");
         
         // release hold on collection
         signalReady(request);
         return response;
+        
     }