Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CityDoctor
CityDoctor2
Commits
03d1c341
Commit
03d1c341
authored
3 months ago
by
Riegel
Browse files
Options
Download
Email Patches
Plain Diff
Fix: Use correct InputStream for parsing of ZipEntry
parent
02f9ac3b
master
dev
dev_cpp_code_conversion
dev_gui_features_zip_loading
3.17.0
archive/dev_gui_features_zip_loading
2 merge requests
!28
Version 3.17.0 Release
,
!26
Add ZIP-archive support
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CityDoctorParent/Extensions/CityDoctorZipLoader/src/main/java/de/hft/stuttgart/citydoctor2/ziploader/CityGmlZipEntry.java
+3
-2
.../hft/stuttgart/citydoctor2/ziploader/CityGmlZipEntry.java
with
3 additions
and
2 deletions
+3
-2
CityDoctorParent/Extensions/CityDoctorZipLoader/src/main/java/de/hft/stuttgart/citydoctor2/ziploader/CityGmlZipEntry.java
+
3
-
2
View file @
03d1c341
...
...
@@ -10,6 +10,7 @@ import org.apache.logging.log4j.LogManager;
import
org.apache.logging.log4j.Logger
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.util.zip.ZipEntry
;
import
java.util.zip.ZipFile
;
import
java.util.zip.ZipInputStream
;
...
...
@@ -30,9 +31,9 @@ public class CityGmlZipEntry {
return
new
ErroneousEntry
(
entry
,
ZipEntryErrorType
.
EXCESSIVE_FILESIZE
);
}
else
{
try
{
Zip
InputStream
z
is
=
new
ZipInputStream
(
archive
.
getInputStream
(
entry
)
)
;
InputStream
is
=
archive
.
getInputStream
(
entry
);
CityGmlParser
.
gagLogger
(
true
);
CityDoctorModel
model
=
CityGmlParser
.
parseCityGmlStream
(
z
is
,
config
);
CityDoctorModel
model
=
CityGmlParser
.
parseCityGmlStream
(
is
,
config
);
return
new
CityGmlZipEntry
(
entry
.
getName
(),
model
);
}
catch
(
CityGmlParseException
|
InvalidGmlFileException
e
)
{
logger
.
error
(
e
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets