From issues-return-38358-archive-asf-public=cust-asf.ponee.io@karaf.apache.org Wed Jan 17 18:15:06 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 81C3C18062C for ; Wed, 17 Jan 2018 18:15:06 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 71E5E160C35; Wed, 17 Jan 2018 17:15:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B7311160C1B for ; Wed, 17 Jan 2018 18:15:05 +0100 (CET) Received: (qmail 55231 invoked by uid 500); 17 Jan 2018 17:15:04 -0000 Mailing-List: contact issues-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list issues@karaf.apache.org Received: (qmail 55220 invoked by uid 99); 17 Jan 2018 17:15:04 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jan 2018 17:15:04 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 76D68D58E3 for ; Wed, 17 Jan 2018 17:15:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -99.911 X-Spam-Level: X-Spam-Status: No, score=-99.911 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01, USER_IN_WHITELIST=-100] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id wbNpsCjNhO7e for ; Wed, 17 Jan 2018 17:15:03 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 10E475F30C for ; Wed, 17 Jan 2018 17:15:03 +0000 (UTC) Received: from jira-lw-us.apache.org (unknown [207.244.88.139]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 03D03E0F23 for ; Wed, 17 Jan 2018 17:15:01 +0000 (UTC) Received: from jira-lw-us.apache.org (localhost [127.0.0.1]) by jira-lw-us.apache.org (ASF Mail Server at jira-lw-us.apache.org) with ESMTP id B7B97212FF for ; Wed, 17 Jan 2018 17:15:00 +0000 (UTC) Date: Wed, 17 Jan 2018 17:15:00 +0000 (UTC) From: "ASF GitHub Bot (JIRA)" To: issues@karaf.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (KARAF-5561) Typo in hazelcast group name prevent blacklist/whitelist to be checked MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/KARAF-5561?page=3Dcom.atlassian= .jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=3D1632= 9030#comment-16329030 ]=20 ASF GitHub Bot commented on KARAF-5561: --------------------------------------- jbonofre closed pull request #43: [KARAF-5561] Fixed typo in category name URL: https://github.com/apache/karaf-cellar/pull/43 =20 =20 =20 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEven= tHandler.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleE= ventHandler.java index 8916b4f6..c2f7da6e 100644 --- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandle= r.java +++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandle= r.java @@ -79,7 +79,7 @@ public void handle(ClusterBundleEvent event) { // check the features first List matchingFeatures =3D retrieveFeature(event.g= etLocation()); for (Feature feature : matchingFeatures) { - if (!isAllowed(event.getSourceGroup(), "features", fea= ture.getName(), EventType.INBOUND)) { + if (!isAllowed(event.getSourceGroup(), "feature", feat= ure.getName(), EventType.INBOUND)) { LOGGER.trace("CELLAR BUNDLE: bundle {} is containe= d in feature {} marked BLOCKED INBOUND for cluster group {}", event.getLoca= tion(), feature.getName(), event.getSourceGroup().getName()); return; } diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundl= eListener.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalB= undleListener.java index bfb7de0a..ea8a1c4e 100644 --- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListen= er.java +++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListen= er.java @@ -121,7 +121,7 @@ public void bundleChanged(BundleEvent event) { // check the features first =09List matchingFeatures =3D retrieveFeat= ure(bundleLocation); =09for (Feature feature : matchingFeatures) { - =09=09=09=09=09if (!isAllowed(group, "features", feature.getNa= me(), EventType.OUTBOUND)) { + =09=09=09=09=09if (!isAllowed(group, "feature", feature.getNam= e(), EventType.OUTBOUND)) { =09=09=09=09=09=09LOGGER.trace("CELLAR BUNDLE: bundle {} is co= ntained in feature {} marked BLOCKED OUTBOUND for cluster group {}", bundle= Location, feature.getName(), group.getName()); =09=09=09=09=09=09return; =09=09=09=09=09} =20 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. =20 For queries about this service, please contact Infrastructure at: users@infra.apache.org > Typo in hazelcast group name prevent blacklist/whitelist to be checked > ---------------------------------------------------------------------- > > Key: KARAF-5561 > URL: https://issues.apache.org/jira/browse/KARAF-5561 > Project: Karaf > Issue Type: Bug > Components: cellar-bundle > Affects Versions: cellar-4.0.4, cellar-4.1.1 > Reporter: Thomas Draier > Assignee: Jean-Baptiste Onofr=C3=A9 > Priority: Major > Fix For: cellar-4.0.5, cellar-4.1.2 > > > The "category" parameter passed to isAllowed() is set to "features" inste= ad of "feature" in BundleEventHandler and LocalBundleListener, which makes = the code ignore the features whitelist/blacklist in these 2 cases. -- This message was sent by Atlassian JIRA (v7.6.3#76005)