Fixes copyArchiveToContainerCmdImpl fail when hostResource has an empty dir which gets added as last entry to tar

denlap007 · denlap007 · commit 9641b01d0559 · 2016-05-08T19:07:39.000+03:00
CopyArchiveToContainerCmdImpl FAILS with com.github.dockerjava.api.exception.BadRequestException: Unable to perform tar on host resource /path/to/resource, if the resourceHost is a dir that containes an empty dir which will be added as the last entry to the generated .tar file.
diff --git a/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java b/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
@@ -26,6 +26,7 @@ public TarDirWalker(Path basePath, TarArchiveOutputStream tarArchiveOutputStream
     public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
         if (!dir.equals(basePath)) {
             tarArchiveOutputStream.putArchiveEntry(new TarArchiveEntry(FilePathUtil.relativize(basePath, dir)));
+            tarArchiveOutputStream.closeArchiveEntry();
         }
         return FileVisitResult.CONTINUE;
     }

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public TarDirWalker(Path basePath, TarArchiveOutputStream tarArchiveOutputStream`
`26`	`26`	`public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {`
`27`	`27`	`if (!dir.equals(basePath)) {`
`28`	`28`	`tarArchiveOutputStream.putArchiveEntry(new TarArchiveEntry(FilePathUtil.relativize(basePath, dir)));`
	`29`	`+ tarArchiveOutputStream.closeArchiveEntry();`
`29`	`30`	`}`
`30`	`31`	`return FileVisitResult.CONTINUE;`
`31`	`32`	`}`