From: jprocter <jprocter@compbio.dundee.ac.uk>
Date: Thu, 27 Sep 2007 12:55:18 +0000 (+0000)
Subject: Added test to ensure all bytes are transferred during backupSessionFile
X-Git-Tag: Release_0.2~44
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=eedd2efc7acf8a78158b0b84e725f54eb79ce790;p=vamsas.git

Added test to ensure all bytes are transferred during backupSessionFile

git-svn-id: https://svn.lifesci.dundee.ac.uk/svn/repository/trunk@476 be28352e-c001-0410-b1a7-c7978e42abec
---

diff --git a/src/uk/ac/vamsas/client/simpleclient/SessionFile.java b/src/uk/ac/vamsas/client/simpleclient/SessionFile.java
index e2d1db7..aa5e779 100644
--- a/src/uk/ac/vamsas/client/simpleclient/SessionFile.java
+++ b/src/uk/ac/vamsas/client/simpleclient/SessionFile.java
@@ -118,11 +118,23 @@ public class SessionFile {
     if (lockFile(extantLock)) {
       try {
         tempfile = File.createTempFile(backupPrefix, backupSuffix, backupDir);
-        if (fileLock.length()>0) {
+        long sourceln = fileLock.length();
+        if (sourceln>0) {
           FileOutputStream tos = new FileOutputStream(tempfile);
           ReadableByteChannel channel;
-          tos.getChannel().transferFrom(channel=fileLock.getRaChannel(), 0,
-              fileLock.length());
+          channel = fileLock.getRaChannel().position(0);
+          long ntrans = 0;
+          while (ntrans<sourceln)
+          {
+            long tlen;
+            ntrans+= tlen = tos.getChannel().transferFrom(channel, ntrans,
+              sourceln);
+            if (log.isDebugEnabled())
+            {
+              log.debug
+              ("Transferred "+tlen+" out of "+sourceln+" bytes");
+            }
+          }
           tos.close();
           if (!channel.isOpen())
             throw new Error("LIBRARY PORTABILITY ISSUE: "+tos.getChannel().getClass()+".transferFrom closes source channel!");