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 2016/07/10 19:38:20 UTC
[1/2] karaf-cellar git commit: [KARAF-4618] Upgrade to Hazelcast 3.6.4
Repository: karaf-cellar
Updated Branches:
refs/heads/master 8e98de8ab -> f8a15e208
[KARAF-4618] Upgrade to Hazelcast 3.6.4
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/fee993a8
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/fee993a8
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/fee993a8
Branch: refs/heads/master
Commit: fee993a8d414c20ba79b72cf3b5007f9e3e37f38
Parents: 8e98de8
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Sun Jul 10 21:37:21 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Sun Jul 10 21:37:21 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/fee993a8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f2ffabf..2e5b500 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<felix.bundlerepository.version>2.0.6</felix.bundlerepository.version>
<felix.utils.version>1.8.0</felix.utils.version>
<felix.webconsole.version>4.2.14</felix.webconsole.version>
- <hazelcast.version>3.6.3</hazelcast.version>
+ <hazelcast.version>3.6.4</hazelcast.version>
<jclouds.version>1.9.1</jclouds.version>
<joda-time.version>2.9.1</joda-time.version>
<junit.version>4.11</junit.version>
[2/2] karaf-cellar git commit: [KARAF-4316] Fix cluster features
repository event handling
Posted by jb...@apache.org.
[KARAF-4316] Fix cluster features repository event handling
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/f8a15e20
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/f8a15e20
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/f8a15e20
Branch: refs/heads/master
Commit: f8a15e20816fea9e9a6b3a801d96fb26cc63629e
Parents: fee993a
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Sun Jul 10 21:37:53 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Sun Jul 10 21:37:53 2016 +0200
----------------------------------------------------------------------
.../org/apache/karaf/cellar/features/LocalFeaturesListener.java | 1 +
.../org/apache/karaf/cellar/features/RepositoryEventHandler.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/f8a15e20/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 fbf9ad5..a3a104b 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
@@ -135,6 +135,7 @@ public class LocalFeaturesListener extends FeaturesSupport implements org.apache
clusterRepositoryEvent.setSourceNode(clusterManager.getNode());
clusterRepositoryEvent.setInstall(false);
clusterRepositoryEvent.setUninstall(false);
+ clusterRepositoryEvent.setRefresh(false);
RepositoryEvent.EventType type = event.getType();
Map<String, String> clusterRepositories = clusterManager.getMap(Constants.REPOSITORIES_MAP + Configurations.SEPARATOR + group.getName());
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/f8a15e20/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java
----------------------------------------------------------------------
diff --git a/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java b/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java
index d974b5b..4f95578 100644
--- a/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java
+++ b/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java
@@ -75,7 +75,7 @@ public class RepositoryEventHandler extends FeaturesSupport implements EventHand
try {
// TODO check if isAllowed
if (RepositoryEvent.EventType.RepositoryAdded.equals(type)) {
- if (event.getRefresh()) {
+ if (event.getRefresh() != null && event.getRefresh()) {
LOGGER.debug("CELLAR FEATURE: refresh repository {}", uri);
featuresService.refreshRepository(new URI(uri));
} else {