Changeset 25067 for main/trunk

Timestamp:

2012-02-09T16:22:02+13:00 (12 years ago)

Author:

sjm84

Message:

Moved the collection unload call so that it is done after a the status check

File:

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

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

@@ -174 +174 @@
         String lang = request.getAttribute(GSXML.LANG_ATT);
 
-        UserContext userContext = new UserContext(request);
-        
-        systemRequest("delete", coll_name, null, userContext);
-
         Element response = runCommand(request, GS2PerlConstructor.ACTIVATE);
         Element status = (Element) GSXML.getChildByTagName(response, GSXML.STATUS_ELEM);
@@ -186 +182 @@
             return response;
         }
+        
+        UserContext userContext = new UserContext(request);
+        systemRequest("delete", coll_name, null, userContext);
 
         // check for finished
@@ -202 +201 @@
             return response;
         }
+
         while (!GSStatus.isCompleted(status_code))
         {
@@ -284 +284 @@
             return response;
         }
-        
+
         UserContext userContext = new UserContext(request);
 
@@ -324 +324 @@
 
         String coll_name = (String) params.get(COL_PARAM);
-        
+
         UserContext userContext = new UserContext(request);