mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
fixing conflicts
This commit is contained in:
parent
61c0ebc995
commit
14ea6dbba8
@ -38,6 +38,7 @@ import java.io.FileOutputStream;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
import java.nio.file.Files;
|
||||||
import java.util.zip.ZipEntry;
|
import java.util.zip.ZipEntry;
|
||||||
import java.util.zip.ZipInputStream;
|
import java.util.zip.ZipInputStream;
|
||||||
|
|
||||||
@ -120,16 +121,11 @@ public class ArtifactsParser {
|
|||||||
throw new ParsingException("Error while parsing the file.", e);
|
throw new ParsingException("Error while parsing the file.", e);
|
||||||
} finally {
|
} finally {
|
||||||
if (tempFile != null) {
|
if (tempFile != null) {
|
||||||
tempFile.delete();
|
try {
|
||||||
}
|
Files.delete(tempFile.toPath());
|
||||||
try {
|
} catch (IOException e) {
|
||||||
if (out != null) {
|
log.error("Error occured while deleting the temp file", e);
|
||||||
out.close();
|
|
||||||
}
|
}
|
||||||
if (stream != null) {
|
|
||||||
stream.close();
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user