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 2018/01/17 17:15:41 UTC
[karaf-cellar] branch master updated: [KARAF-5561] Fixed typo in
category name
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-cellar.git
The following commit(s) were added to refs/heads/master by this push:
new 1be5b92 [KARAF-5561] Fixed typo in category name
1be5b92 is described below
commit 1be5b92931e1bbe2ba01abb57c1da786fcc2d3aa
Author: Thomas Draier <td...@jahia.com>
AuthorDate: Mon Jan 8 10:42:19 2018 +0100
[KARAF-5561] Fixed typo in category name
---
.../main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java | 2 +-
.../main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java
index 8916b4f..c2f7da6 100644
--- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java
+++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java
@@ -79,7 +79,7 @@ public class BundleEventHandler extends BundleSupport implements EventHandler<Cl
// check the features first
List<Feature> matchingFeatures = retrieveFeature(event.getLocation());
for (Feature feature : matchingFeatures) {
- if (!isAllowed(event.getSourceGroup(), "features", feature.getName(), EventType.INBOUND)) {
+ if (!isAllowed(event.getSourceGroup(), "feature", feature.getName(), EventType.INBOUND)) {
LOGGER.trace("CELLAR BUNDLE: bundle {} is contained in feature {} marked BLOCKED INBOUND for cluster group {}", event.getLocation(), feature.getName(), event.getSourceGroup().getName());
return;
}
diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java
index bfb7de0..ea8a1c4 100644
--- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java
+++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java
@@ -121,7 +121,7 @@ public class LocalBundleListener extends BundleSupport implements SynchronousBun
// check the features first
List<Feature> matchingFeatures = retrieveFeature(bundleLocation);
for (Feature feature : matchingFeatures) {
- if (!isAllowed(group, "features", feature.getName(), EventType.OUTBOUND)) {
+ if (!isAllowed(group, "feature", feature.getName(), EventType.OUTBOUND)) {
LOGGER.trace("CELLAR BUNDLE: bundle {} is contained in feature {} marked BLOCKED OUTBOUND for cluster group {}", bundleLocation, feature.getName(), group.getName());
return;
}
--
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <co...@karaf.apache.org>'].