Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AD6A9CB32 for ; Wed, 6 Jun 2012 13:17:08 +0000 (UTC) Received: (qmail 79885 invoked by uid 500); 6 Jun 2012 13:17:08 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 79829 invoked by uid 500); 6 Jun 2012 13:17:08 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 79820 invoked by uid 99); 6 Jun 2012 13:17:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jun 2012 13:17:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jun 2012 13:17:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 64B0023889E0; Wed, 6 Jun 2012 13:16:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1346878 - /jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventConsumer.java Date: Wed, 06 Jun 2012 13:16:45 -0000 To: commits@jackrabbit.apache.org From: alexparvulescu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120606131645.64B0023889E0@eris.apache.org> Author: alexparvulescu Date: Wed Jun 6 13:16:44 2012 New Revision: 1346878 URL: http://svn.apache.org/viewvc?rev=1346878&view=rev Log: JCR-3272 EventConsumer.canRead() should rely on AccessManager.isGranted() (2.4 backport) Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventConsumer.java Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventConsumer.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventConsumer.java?rev=1346878&r1=1346877&r2=1346878&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventConsumer.java (original) +++ jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventConsumer.java Wed Jun 6 13:16:44 2012 @@ -31,6 +31,7 @@ import javax.jcr.observation.EventListen import org.apache.jackrabbit.core.SessionImpl; import org.apache.jackrabbit.core.id.ItemId; +import org.apache.jackrabbit.core.security.authorization.Permission; import org.apache.jackrabbit.core.state.ItemState; import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.PathFactory; @@ -303,6 +304,6 @@ class EventConsumer { */ private boolean canRead(EventState eventState) throws RepositoryException { Path targetPath = pathFactory.create(eventState.getParentPath(), eventState.getChildRelPath().getName(), eventState.getChildRelPath().getNormalizedIndex(), true); - return session.getAccessManager().canRead(targetPath, null); + return session.getAccessManager().isGranted(targetPath, Permission.READ); } }