diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipEntry.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipEntry.java index 132dd0c30338925a9eb1e2711ee999443ceab50c..ad9896400d763f967f7be848b4362339c4f8928d 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipEntry.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipEntry.java @@ -19,9 +19,8 @@ public class CityGmlZipEntry { private final String fileName; private CityDoctorModel model; private CityGmlZipArchive parentArchive; - private boolean validated = false; - private boolean decompressed = false; - private long size = -1L; + private boolean decompressed; + private long fileSize = -1L; private static final long MB = 1024 * 1024L; private ZipEntryErrorType errorType = null; @@ -66,13 +65,13 @@ public class CityGmlZipEntry { private boolean entrySizeWithinMemoryLimits() throws IOException { long memoryLimit = (long) Math.ceil(((double) Runtime.getRuntime().maxMemory() / MB)*0.9); - if (size != -1L) { - return memoryLimit > size; + if (fileSize != -1L) { + return memoryLimit > fileSize; } try (CityGmlZipInputStream cgis = new CityGmlZipInputStream(this)){ long filesize = cgis.getFileSize(memoryLimit); if (filesize != -1){ - this.size = filesize; + this.fileSize = filesize; return true; } else { return false;