diff --git a/src/com/sheepit/client/Client.java b/src/com/sheepit/client/Client.java index 29d2a0e..95218f4 100644 --- a/src/com/sheepit/client/Client.java +++ b/src/com/sheepit/client/Client.java @@ -711,7 +711,7 @@ public class Client { renderer_path_file.mkdir(); // unzip the archive - ret = Utils.unzipFileIntoDirectory(renderer_archive, renderer_path, null); + ret = Utils.unzipFileIntoDirectory(renderer_archive, renderer_path, null, log); if (ret != 0) { this.log.error("Client::prepareWorkingDirectory, error(1) with Utils.unzipFileIntoDirectory(" + renderer_archive + ", " + renderer_path + ") returned " + ret); this.gui.error("Client::prepareWorkingDirectory, error with Utils.unzipFileIntoDirectory of the renderer (returned " + ret + ")"); @@ -739,7 +739,7 @@ public class Client { scene_path_file.mkdir(); // unzip the archive - ret = Utils.unzipFileIntoDirectory(scene_archive, scene_path, ajob.getSceneArchivePassword()); + ret = Utils.unzipFileIntoDirectory(scene_archive, scene_path, ajob.getSceneArchivePassword(), log); if (ret != 0) { this.log.error("Client::prepareWorkingDirectory, error(2) with Utils.unzipFileIntoDirectory(" + scene_archive + ", " + scene_path + ") returned " + ret); this.gui.error("Client::prepareWorkingDirectory, error with Utils.unzipFileIntoDirectory of the scene (returned " + ret + ")"); diff --git a/src/com/sheepit/client/Utils.java b/src/com/sheepit/client/Utils.java index 98e0cfb..5ada019 100644 --- a/src/com/sheepit/client/Utils.java +++ b/src/com/sheepit/client/Utils.java @@ -24,6 +24,8 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.PrintWriter; +import java.io.StringWriter; import java.nio.file.Files; import java.nio.file.Paths; import java.security.DigestInputStream; @@ -49,7 +51,7 @@ import com.sheepit.client.Error.ServerCode; import com.sheepit.client.exception.FermeExceptionNoSpaceLeftOnDevice; public class Utils { - public static int unzipFileIntoDirectory(String zipFileName_, String destinationDirectory, String password) throws FermeExceptionNoSpaceLeftOnDevice { + public static int unzipFileIntoDirectory(String zipFileName_, String destinationDirectory, String password, Log log) throws FermeExceptionNoSpaceLeftOnDevice { try { ZipFile zipFile = new ZipFile(zipFileName_); UnzipParameters unzipParameters = new UnzipParameters(); @@ -61,7 +63,10 @@ public class Utils { zipFile.extractAll(destinationDirectory, unzipParameters); } catch (ZipException e) { - e.printStackTrace(); + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + e.printStackTrace(pw); + log.debug("Utils::unzipFileIntoDirectory(" + zipFileName_ + "," + destinationDirectory + ") exception " + e + " stacktrace: " + sw.toString()); return -1; } return 0;