You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/04/03 08:39:09 UTC
[3/3] karaf git commit: [KARAF-5081] Fix problem with resource
extraction from kar files
[KARAF-5081] Fix problem with resource extraction from kar files
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/fa3828bb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/fa3828bb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/fa3828bb
Branch: refs/heads/master
Commit: fa3828bbab6d23997092547a7540b5b520c00a0d
Parents: 689616a
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Apr 3 10:38:57 2017 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Apr 3 10:38:57 2017 +0200
----------------------------------------------------------------------
kar/src/main/java/org/apache/karaf/kar/internal/Kar.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/fa3828bb/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java
----------------------------------------------------------------------
diff --git a/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java b/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java
index c2a8dd5..601d97f 100644
--- a/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java
+++ b/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java
@@ -115,7 +115,7 @@ public class Kar {
ZipEntry entry = zipIs.getNextEntry();
while (entry != null) {
- if (entry.getName().startsWith("repository")) {
+ if (entry.getName().startsWith("repository/")) {
String path = entry.getName().substring("repository/".length());
File destFile = new File(repoDir, path);
extract(zipIs, entry, destFile);
@@ -128,8 +128,8 @@ public class Kar {
}
}
- if (entry.getName().startsWith("resource")) {
- String path = entry.getName().substring("resource/".length());
+ if (entry.getName().startsWith("resources/")) {
+ String path = entry.getName().substring("resources/".length());
File destFile = new File(resourceDir, path);
extract(zipIs, entry, destFile);
}