[ARVADOS] updated: 1.3.0-1792-gde6d121ea
Git user
git at public.curoverse.com
Thu Oct 24 15:37:54 UTC 2019
Summary of changes:
.../main/java/org/arvados/client/logic/collection/FileToken.java | 6 +++---
.../main/java/org/arvados/client/logic/keep/FileDownloader.java | 8 ++++----
.../java/org/arvados/client/logic/collection/FileTokenTest.java | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
via de6d121eac429a1dc65e3c3e646f45d54bcfcbf3 (commit)
via bd8028e0b754dc36c4118ce50eea930fba9748d3 (commit)
via faf146c21364533f95d937fe75cc2a46344eed83 (commit)
via 62d79fb469256caa6e287d0787d7d58f6142ed69 (commit)
via ab3284a88a806268f680dd7fc7651a85ad87db01 (commit)
via 3e5a4f9f0c4ece9af648a84a5274114ebe922e06 (commit)
via d0e4ca7b44ab1ed8c0eb1f4df3a02127d070afb1 (commit)
from cc8174aca759773fa661bd9172f877b2d639576b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit de6d121eac429a1dc65e3c3e646f45d54bcfcbf3
Merge: cc8174aca bd8028e0b
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Thu Oct 24 11:25:04 2019 -0400
Merge branch 'MajewskiKrzysztof/master' refs #15740
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
commit bd8028e0b754dc36c4118ce50eea930fba9748d3
Merge: faf146c21 62d79fb46
Author: Krzysztof Majewski <krzysztof.majewski.km1 at contractors.roche.com>
Date: Wed Oct 23 18:45:35 2019 +0200
Merge branch 'master' of https://github.com/MajewskiKrzysztof/arvados
Arvados-DCO-1.1-Signed-off-by: Krzysztof Majewski
<majewski.kielce at gmail.com>
commit faf146c21364533f95d937fe75cc2a46344eed83
Merge: ab3284a88 3e5a4f9f0
Author: Krzysztof Majewski <krzysztof.majewski.km1 at contractors.roche.com>
Date: Wed Oct 23 18:41:32 2019 +0200
Merge branch 'master' of https://github.com/MajewskiKrzysztof/arvados
commit 62d79fb469256caa6e287d0787d7d58f6142ed69
Merge: ab3284a88 3e5a4f9f0
Author: Krzysztof Majewski <krzysztof.majewski.km1 at contractors.roche.com>
Date: Wed Oct 23 18:41:32 2019 +0200
Merge branch 'master' of https://github.com/MajewskiKrzysztof/arvados
commit ab3284a88a806268f680dd7fc7651a85ad87db01
Author: Krzysztof Majewski <krzysztof.majewski.km1 at contractors.roche.com>
Date: Tue Oct 22 11:08:19 2019 +0200
NumberFormatException fix
diff --git a/sdk/java-v2/src/main/java/org/arvados/client/logic/collection/FileToken.java b/sdk/java-v2/src/main/java/org/arvados/client/logic/collection/FileToken.java
index 2f5050282..3f83604f4 100644
--- a/sdk/java-v2/src/main/java/org/arvados/client/logic/collection/FileToken.java
+++ b/sdk/java-v2/src/main/java/org/arvados/client/logic/collection/FileToken.java
@@ -29,7 +29,7 @@ public class FileToken {
private void splitFileTokenInfo(String fileTokenInfo) {
String[] tokenPieces = fileTokenInfo.split(":");
this.filePosition = Integer.parseInt(tokenPieces[0]);
- this.fileSize = Integer.parseInt(tokenPieces[1]);
+ this.fileSize = Long.parseLong(tokenPieces[1]);
this.fileName = tokenPieces[2].replace(Characters.SPACE, " ");
}
commit 3e5a4f9f0c4ece9af648a84a5274114ebe922e06
Author: Krzysztof Majewski <krzysztof.majewski.km1 at contractors.roche.com>
Date: Tue Oct 22 11:08:19 2019 +0200
NumberFormatException fix
diff --git a/sdk/java-v2/src/main/java/org/arvados/client/logic/collection/FileToken.java b/sdk/java-v2/src/main/java/org/arvados/client/logic/collection/FileToken.java
index 2f5050282..3f83604f4 100644
--- a/sdk/java-v2/src/main/java/org/arvados/client/logic/collection/FileToken.java
+++ b/sdk/java-v2/src/main/java/org/arvados/client/logic/collection/FileToken.java
@@ -29,7 +29,7 @@ public class FileToken {
private void splitFileTokenInfo(String fileTokenInfo) {
String[] tokenPieces = fileTokenInfo.split(":");
this.filePosition = Integer.parseInt(tokenPieces[0]);
- this.fileSize = Integer.parseInt(tokenPieces[1]);
+ this.fileSize = Long.parseLong(tokenPieces[1]);
this.fileName = tokenPieces[2].replace(Characters.SPACE, " ");
}
commit d0e4ca7b44ab1ed8c0eb1f4df3a02127d070afb1
Author: Krzysztof Majewski <krzysztof.majewski.km1 at contractors.roche.com>
Date: Tue Oct 22 11:06:39 2019 +0200
NumberFormatException fix
diff --git a/sdk/java-v2/src/main/java/org/arvados/client/logic/collection/FileToken.java b/sdk/java-v2/src/main/java/org/arvados/client/logic/collection/FileToken.java
index b41ccd3cd..2f5050282 100644
--- a/sdk/java-v2/src/main/java/org/arvados/client/logic/collection/FileToken.java
+++ b/sdk/java-v2/src/main/java/org/arvados/client/logic/collection/FileToken.java
@@ -13,7 +13,7 @@ import org.arvados.client.common.Characters;
public class FileToken {
private int filePosition;
- private int fileSize;
+ private long fileSize;
private String fileName;
private String path;
@@ -46,7 +46,7 @@ public class FileToken {
return this.filePosition;
}
- public int getFileSize() {
+ public long getFileSize() {
return this.fileSize;
}
diff --git a/sdk/java-v2/src/main/java/org/arvados/client/logic/keep/FileDownloader.java b/sdk/java-v2/src/main/java/org/arvados/client/logic/keep/FileDownloader.java
index 1f694f25c..c1e8849e3 100644
--- a/sdk/java-v2/src/main/java/org/arvados/client/logic/keep/FileDownloader.java
+++ b/sdk/java-v2/src/main/java/org/arvados/client/logic/keep/FileDownloader.java
@@ -187,7 +187,7 @@ public class FileDownloader {
// values for tracking file output streams and matching data chunks with initial files
int currentDataChunkNumber;
int bytesDownloadedFromChunk;
- int bytesToDownload;
+ long bytesToDownload;
byte[] currentDataChunk;
boolean remainingDataInChunk;
final List<KeepLocator> keepLocators;
@@ -199,11 +199,11 @@ public class FileDownloader {
this.keepLocators = keepLocators;
}
- private int getBytesToDownload() {
+ private long getBytesToDownload() {
return bytesToDownload;
}
- private void setBytesToDownload(int bytesToDownload) {
+ private void setBytesToDownload(long bytesToDownload) {
this.bytesToDownload = bytesToDownload;
}
@@ -244,7 +244,7 @@ public class FileDownloader {
private void writeDownDataChunkPartially(FileOutputStream fos) throws IOException {
//write all remaining bytes for this file from current chunk
- fos.write(currentDataChunk, bytesDownloadedFromChunk, bytesToDownload);
+ fos.write(currentDataChunk, bytesDownloadedFromChunk, (int) bytesToDownload);
// update number of bytes downloaded from this chunk
bytesDownloadedFromChunk += bytesToDownload;
// set remaining data in chunk to true
diff --git a/sdk/java-v2/src/test/java/org/arvados/client/logic/collection/FileTokenTest.java b/sdk/java-v2/src/test/java/org/arvados/client/logic/collection/FileTokenTest.java
index 13939852c..a95ea754e 100644
--- a/sdk/java-v2/src/test/java/org/arvados/client/logic/collection/FileTokenTest.java
+++ b/sdk/java-v2/src/test/java/org/arvados/client/logic/collection/FileTokenTest.java
@@ -15,7 +15,7 @@ public class FileTokenTest {
public static final String FILE_TOKEN_INFO = "0:1024:test-file1";
public static final int FILE_POSITION = 0;
- public static final int FILE_LENGTH = 1024;
+ public static final long FILE_LENGTH = 1024L;
public static final String FILE_NAME = "test-file1";
public static final String FILE_PATH = "c" + Characters.SLASH;
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list