You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jg...@apache.org on 2014/07/26 03:52:17 UTC

[35/50] git commit: [KARAF-3085] Enhance FeatureFinder

[KARAF-3085] Enhance FeatureFinder


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/cc16671f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/cc16671f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/cc16671f

Branch: refs/remotes/karaf-2.3.x
Commit: cc16671f763405a89ae44b3378e2c7e18da04596
Parents: 0eb3f99
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Jul 22 11:48:25 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Jul 22 11:49:00 2014 +0200

----------------------------------------------------------------------
 .../apache/karaf/features/command/FeatureFinder.java    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/cc16671f/features/command/src/main/java/org/apache/karaf/features/command/FeatureFinder.java
----------------------------------------------------------------------
diff --git a/features/command/src/main/java/org/apache/karaf/features/command/FeatureFinder.java b/features/command/src/main/java/org/apache/karaf/features/command/FeatureFinder.java
index 247cbcd..7954ce4 100644
--- a/features/command/src/main/java/org/apache/karaf/features/command/FeatureFinder.java
+++ b/features/command/src/main/java/org/apache/karaf/features/command/FeatureFinder.java
@@ -33,12 +33,18 @@ public class FeatureFinder implements ManagedService {
     }
 
     public URI getUriFor(String name, String version) throws Exception {
-        String uri = nameToArtifactMap.get(name);
+        String url;
+        synchronized (nameToArtifactMap) {
+            url = nameToArtifactMap.get(name);
+        }
+        if (url == null) {
+            return null;
+        }
         if (version != null) {
             // replace the version in the URL with the provided one
-            uri = MvnUtils.replaceVersion(uri, version);
+            url = MvnUtils.replaceVersion(url, version);
         }
-        return new URI(uri);
+        return URI.create(url);
     }
 
     @SuppressWarnings("rawtypes")