X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fvamsas%2Ftest%2Fsimpleclient%2FVamsasArchive.java;h=09ddf347801959d979ccb2a675359331c44722c1;hb=30801ef84cde704404d052f00c70ae129820bb0b;hp=3ec7d4d9e0cdbd2593b0840d3f7fd27935a354a2;hpb=4f11373ddecd53546b3b22e0358f3df01b24a6e6;p=vamsas.git

diff --git a/src/org/vamsas/test/simpleclient/VamsasArchive.java b/src/org/vamsas/test/simpleclient/VamsasArchive.java
index 3ec7d4d..09ddf34 100644
--- a/src/org/vamsas/test/simpleclient/VamsasArchive.java
+++ b/src/org/vamsas/test/simpleclient/VamsasArchive.java
@@ -125,12 +125,18 @@ public class VamsasArchive {
         }
         while (newf.exists()); 
       } */
+      if (newf.exists()) {
+        log.info("Removing existing "+newf);
+        newf.delete();
+      }
+        
       log.info("Now writing new Archive into "+newf.getAbsolutePath());
       org.vamsas.client.simpleclient.VamsasArchive va=null;
       { // hold lock over deletion and write of new archive.
         //Lock wlock = sfile.getLock();
         //newf.delete(); // clear out old file.
-        va = new org.vamsas.client.simpleclient.VamsasArchive(newf, true, true); // , sfile);
+        sfile.getLock();
+        va = new org.vamsas.client.simpleclient.VamsasArchive(newf, true, true, sfile);
         // open another and...
         ApplicationData appdata = makeDemoAppdata(va, 
             "org.vamsas.test.simpleclient.VamsasArchive", "arnold Bugger esq", "disOrganised");
@@ -146,9 +152,11 @@ public class VamsasArchive {
       {
         Lock lock=sfile.getLock();
         if (lock==null)
-          while ((lock=sfile.getLock())==null)
+          while ((lock=sfile.getLock())==null) {
             log.info("Waiting for lock.");
-        VamsasArchiveReader vreader = new VamsasArchiveReader(newf);
+            Thread.sleep(100);
+          }
+        VamsasArchiveReader vreader = new VamsasArchiveReader(sfile.getVamsasFile());// lock); // cannot do new JarFile on a locked file. // newf);
         SimpleDocument sdoc = new SimpleDocument("testing new vamsas write");
         ArchiveReports.reportDocument(sdoc.getVamsasDocument(vreader), vreader, true, System.out);
         sfile.unLock();