seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix after rebasing 

Signed-off-by: Anatoliy Bazko <abazko@redhat.com>
6.19.x
Anatoliy Bazko 2018-09-05 17:31:39 +03:00 committed by Thomas Mäder
parent 5c16de197c
commit 837eed62ba
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/inject/SeleniumTestHandler.java
View File

@ -41,6 +41,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Stream;
import java.util.zip.ZipOutputStream;
import javax.annotation.PreDestroy;
import javax.validation.constraints.NotNull;
import org.apache.commons.io.FileUtils;
@ -424,11 +425,11 @@ public abstract class SeleniumTestHandler
}
try {
ZipUtils.zipDir(
pathToStoreWorkspaceLogs.toFile().getAbsolutePath(),
pathToStoreWorkspaceLogs.toFile(),
pathToZipWithWorkspaceLogs.toFile(),
null);
Path zip = Files.createFile(pathToZipWithWorkspaceLogs);
try (ZipOutputStream out = ZipUtils.stream(zip)) {
ZipUtils.add(out, pathToStoreWorkspaceLogs);
}
FileUtils.deleteQuietly(pathToStoreWorkspaceLogs.toFile());
} catch (IOException | IllegalArgumentException e) {
LOG.warn("Error of creation zip-file with workspace logs.", e);