Merge pull request docker-java#1003 from fengxx/bugfix/mutable_cp_file_stream

KostyaSha · web-flow · commit 9a797ae0b1ee · 2018-03-12T15:59:08.000+03:00
tarInputStream was changed during exec and rerun the method will thro…
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
@@ -143,6 +143,7 @@ public Void exec() throws NotFoundException {
             } catch (IOException e) {
                 throw new DockerClientException("Unable to read temp file " + toUpload.toFile().getAbsolutePath(), e);
             } finally {
+                this.tarInputStream = null;
                 // remove tmp docker-javaxxx.tar.gz
                 toUpload.toFile().delete();
             }
diff --git a/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.cmd;
 
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
@@ -47,6 +48,17 @@ public void copyStreamToContainer() throws Exception {
         assertFileCopied(container);
     }
 
+    @Test
+    public void copyStreamToContainerTwice() throws Exception {
+        CreateContainerResponse container = prepareContainerForCopy("rerun");
+        CopyArchiveToContainerCmd copyArchiveToContainerCmd=dockerRule.getClient().copyArchiveToContainerCmd(container.getId())
+                .withHostResource("src/test/resources/testReadFile");
+        copyArchiveToContainerCmd.exec();
+        assertFileCopied(container);
+        //run again to make sure no DockerClientException
+        copyArchiveToContainerCmd.exec();
+    }
+
     private CreateContainerResponse prepareContainerForCopy(String method) {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
                 .withName("docker-java-itest-copyToContainer" + method + dockerRule.getKind())

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ public Void exec() throws NotFoundException {`
`143`	`143`	`} catch (IOException e) {`
`144`	`144`	`throw new DockerClientException("Unable to read temp file " + toUpload.toFile().getAbsolutePath(), e);`
`145`	`145`	`} finally {`
	`146`	`+ this.tarInputStream = null;`
`146`	`147`	`// remove tmp docker-javaxxx.tar.gz`
`147`	`148`	`toUpload.toFile().delete();`
`148`	`149`	`}`