You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/03/17 17:26:15 UTC
[2/2] karaf-cellar git commit: [KARAF-3615] Fix the features repo
push exception catching
[KARAF-3615] Fix the features repo push exception catching
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/f9a2725a
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/f9a2725a
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/f9a2725a
Branch: refs/heads/master
Commit: f9a2725a424f5678d0bc8be49a5bb722c9ea07b3
Parents: 4b9dc08
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Mar 17 17:25:43 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Mar 17 17:25:43 2015 +0100
----------------------------------------------------------------------
.../apache/karaf/cellar/features/LocalFeaturesListener.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/f9a2725a/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java
----------------------------------------------------------------------
diff --git a/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java b/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java
index 26c5f50..98a7e2e 100644
--- a/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java
+++ b/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java
@@ -138,7 +138,11 @@ public class LocalFeaturesListener extends FeaturesSupport implements org.apache
// update the features repositories in the cluster group
if (RepositoryEvent.EventType.RepositoryAdded.equals(type)) {
if (!clusterRepositories.containsKey(event.getRepository().getURI().toString())) {
- clusterRepositories.put(event.getRepository().getURI().toString(), event.getRepository().getName());
+ try {
+ clusterRepositories.put(event.getRepository().getURI().toString(), event.getRepository().getName());
+ } catch (Exception e) {
+ // nothing to do
+ }
}
// update the features in the cluster group
Map<String, FeatureState> clusterFeatures = clusterManager.getMap(Constants.FEATURES_MAP + Configurations.SEPARATOR + group.getName());