You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by fl...@apache.org on 2017/02/04 15:28:35 UTC
karaf git commit: [KARAF-4978] Fix native memory leak by not closing
ZipInputStream
Repository: karaf
Updated Branches:
refs/heads/master 4dbd30403 -> 329134317
[KARAF-4978] Fix native memory leak by not closing ZipInputStream
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/32913431
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/32913431
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/32913431
Branch: refs/heads/master
Commit: 329134317199ddabecbc38ad8ce2baf637cd0f42
Parents: 4dbd304
Author: Fabian Lange <la...@gmail.com>
Authored: Sat Feb 4 16:24:59 2017 +0100
Committer: Fabian Lange <la...@gmail.com>
Committed: Sat Feb 4 16:28:15 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/karaf/features/internal/region/Subsystem.java | 3 +--
.../src/main/java/org/apache/karaf/profile/assembly/Builder.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/32913431/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java b/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
index 4a4a48b..b38a76d 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
@@ -532,9 +532,8 @@ public class Subsystem extends ResourceImpl {
Map<String, String> getMetadata(StreamProvider provider) throws IOException {
try (
- InputStream is = provider.open();
+ ZipInputStream zis = new ZipInputStream(provider.open())
) {
- ZipInputStream zis = new ZipInputStream(is);
ZipEntry entry;
while ((entry = zis.getNextEntry()) != null) {
if (MANIFEST_NAME.equals(entry.getName())) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/32913431/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
index 9dad8d0..3296021 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
@@ -1483,9 +1483,8 @@ public class Builder {
private Map<String, String> getHeaders(StreamProvider provider) throws IOException {
try (
- InputStream is = provider.open()
+ new ZipInputStream(InputStream is = provider.open())
) {
- ZipInputStream zis = new ZipInputStream(is);
ZipEntry entry;
while ((entry = zis.getNextEntry()) != null) {
if (MANIFEST_NAME.equals(entry.getName())) {