You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2014/11/28 17:14:57 UTC
karaf git commit: Give hint to location in exception
Repository: karaf
Updated Branches:
refs/heads/master c1586ecef -> fb37b388a
Give hint to location in exception
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/fb37b388
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/fb37b388
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/fb37b388
Branch: refs/heads/master
Commit: fb37b388a005922cefda7c7ceef958df4eadb2ab
Parents: c1586ec
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Fri Nov 28 17:13:18 2014 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Fri Nov 28 17:13:18 2014 +0100
----------------------------------------------------------------------
.../internal/download/simple/SimpleDownloader.java | 10 +++++++---
.../apache/karaf/features/internal/region/Subsystem.java | 1 -
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/fb37b388/features/core/src/main/java/org/apache/karaf/features/internal/download/simple/SimpleDownloader.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/download/simple/SimpleDownloader.java b/features/core/src/main/java/org/apache/karaf/features/internal/download/simple/SimpleDownloader.java
index 9daf960..1439c00 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/download/simple/SimpleDownloader.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/download/simple/SimpleDownloader.java
@@ -54,7 +54,7 @@ public class SimpleDownloader implements DownloadManager, Downloader {
}
@Override
- public void download(final String location, final DownloadCallback downloadCallback) throws MalformedURLException {
+ public void download(final String location, final DownloadCallback downloadCallback) {
if (!providers.containsKey(location)) {
providers.putIfAbsent(location, createProvider(location));
}
@@ -67,8 +67,12 @@ public class SimpleDownloader implements DownloadManager, Downloader {
}
}
- protected StreamProvider createProvider(String location) throws MalformedURLException {
- return new UrlProvider(new URL(location));
+ protected StreamProvider createProvider(String location) {
+ try {
+ return new UrlProvider(new URL(location));
+ } catch (MalformedURLException e) {
+ throw new IllegalStateException("Error opening URL " + location, e);
+ }
}
public Map<String, StreamProvider> getProviders() {
http://git-wip-us.apache.org/repos/asf/karaf/blob/fb37b388/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 3318885..c7cc22d 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
@@ -41,7 +41,6 @@ import org.apache.karaf.features.internal.download.DownloadManager;
import org.apache.karaf.features.internal.download.Downloader;
import org.apache.karaf.features.internal.download.StreamProvider;
import org.apache.karaf.features.internal.resolver.FeatureResource;
-import org.apache.karaf.features.internal.resolver.RequirementImpl;
import org.apache.karaf.features.internal.resolver.ResourceBuilder;
import org.apache.karaf.features.internal.resolver.ResourceImpl;
import org.apache.karaf.features.internal.resolver.ResourceUtils;