[ARVADOS] created: 1.3.0-1975-g318a5819e

[Git user]

        at  318a5819e7ac49305f2fe4a23ce6a07e5bd8b42e (commit)


commit 318a5819e7ac49305f2fe4a23ce6a07e5bd8b42e
Merge: 4130c84e6 b9b602aac
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Tue Dec 10 14:40:16 2019 -0300

    Merge branch 'file-token-error' of git://github.com/MajewskiKrzysztof/arvados into MajewskiKrzysztof-file-token-error


commit b9b602aac9122c3c956fc2c05fa5fb360d0b18fb
Author: Krzysztof Majewski <krzysztof.majewski.km1 at contractors.roche.com>
Date:   Tue Dec 3 14:11:42 2019 +0100

    Fix file token error
    Arvados-DCO-1.1-Signed-off-by: Krzysztof Majewski <majewski.kielce at gmail.com>

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 3f83604f4..5186ebd44 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
@@ -12,7 +12,7 @@ import org.arvados.client.common.Characters;
 
 public class FileToken {
 
-    private int filePosition;
+    private long filePosition;
     private long fileSize;
     private String fileName;
     private String path;
@@ -28,7 +28,7 @@ public class FileToken {
 
     private void splitFileTokenInfo(String fileTokenInfo) {
         String[] tokenPieces = fileTokenInfo.split(":");
-        this.filePosition = Integer.parseInt(tokenPieces[0]);
+        this.filePosition = Long.parseLong(tokenPieces[0]);
         this.fileSize = Long.parseLong(tokenPieces[1]);
         this.fileName = tokenPieces[2].replace(Characters.SPACE, " ");
     }
@@ -42,7 +42,7 @@ public class FileToken {
         return Strings.isNullOrEmpty(path) ? fileName : path + fileName;
     }
 
-    public int getFilePosition() {
+    public long getFilePosition() {
         return this.filePosition;
     }
 

-----------------------------------------------------------------------


hooks/post-receive
--