Mercurial > hg > mercurial
changeset 688:5f3b5d95504e
Get rid of ArchiveUtil
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Tue, 17 Dec 2013 19:49:53 +0100 |
parents | e68ae2084759 |
children | cccf6b5c2745 |
files | mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java |
diffstat | 1 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Tue Dec 17 19:09:30 2013 +0100 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Tue Dec 17 19:49:53 2013 +0100 @@ -26,8 +26,6 @@ import jetbrains.buildServer.serverSide.PropertiesProcessor; import jetbrains.buildServer.serverSide.ServerListener; import jetbrains.buildServer.serverSide.ServerListenerAdapter; -import jetbrains.buildServer.util.ArchiveType; -import jetbrains.buildServer.util.ArchiveUtil; import jetbrains.buildServer.util.EventDispatcher; import jetbrains.buildServer.util.FileUtil; import jetbrains.buildServer.util.cache.ResetCacheRegister; @@ -35,6 +33,7 @@ import jetbrains.buildServer.vcs.patches.PatchBuilder; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveInputStream; +import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -421,9 +420,7 @@ FileInputStream fis = new FileInputStream(archive); ArchiveInputStream is = null; try { - is = ArchiveUtil.getArchiveInputStream(ArchiveType.TAR, fis); - if (is == null) - throw new IOException("Unknown archive type"); + is = new TarArchiveInputStream(fis); ArchiveEntry entry = null; while ((entry = is.getNextEntry()) != null) { String fileName = entry.getName();