You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2018/04/26 03:36:16 UTC
[karaf] branch master updated: [KARAF-5694]don't strip out protocol
header
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 9fb7006 [KARAF-5694]don't strip out protocol header
9fb7006 is described below
commit 9fb700697e494b8310cff575f2a7b3ead3e21751
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu Apr 26 11:36:03 2018 +0800
[KARAF-5694]don't strip out protocol header
---
.../features/internal/download/impl/DownloadManagerHelper.java | 8 ++++++++
.../karaf/features/internal/download/impl/SimpleDownloadTask.java | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/download/impl/DownloadManagerHelper.java b/features/core/src/main/java/org/apache/karaf/features/internal/download/impl/DownloadManagerHelper.java
index fb5e4dd..ba2ffed 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/download/impl/DownloadManagerHelper.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/download/impl/DownloadManagerHelper.java
@@ -55,6 +55,14 @@ public final class DownloadManagerHelper {
}
return strippedUrl;
}
+
+ public static String stripStartLevel(String url) {
+ String strippedUrl = url;
+ if (strippedUrl.contains(";start-level=")) {
+ strippedUrl = strippedUrl.substring(0, strippedUrl.indexOf(";start-level="));
+ }
+ return strippedUrl;
+ }
public static String stripInlinedMavenRepositoryUrl(String url) {
if (url.startsWith("mvn:") && url.contains("!")) {
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/download/impl/SimpleDownloadTask.java b/features/core/src/main/java/org/apache/karaf/features/internal/download/impl/SimpleDownloadTask.java
index 527c3a3..3c4cd89 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/download/impl/SimpleDownloadTask.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/download/impl/SimpleDownloadTask.java
@@ -73,7 +73,7 @@ public class SimpleDownloadTask extends AbstractRetryableDownloadTask {
File tmpFile = File.createTempFile("download-", null, dir);
- urlObj = new URL(DownloadManagerHelper.stripUrl(urlObj.toString()));
+ urlObj = new URL(DownloadManagerHelper.stripStartLevel(urlObj.toString()));
try (InputStream is = urlObj.openStream();
OutputStream os = new FileOutputStream(tmpFile)) {
StreamUtils.copy(is, os);
--
To stop receiving notification emails like this one, please contact
ffang@apache.org.