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 9D7969D1B for ; Mon, 17 Oct 2011 23:53:02 +0000 (UTC) Received: (qmail 81440 invoked by uid 500); 17 Oct 2011 23:53:02 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 81403 invoked by uid 500); 17 Oct 2011 23:53:02 -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 81396 invoked by uid 99); 17 Oct 2011 23:53:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Oct 2011 23:53:02 +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; Mon, 17 Oct 2011 23:52:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BEDCA23888FD; Mon, 17 Oct 2011 23:52:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1185434 - /jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/report/AclPrincipalReport.java Date: Mon, 17 Oct 2011 23:52:38 -0000 To: commits@jackrabbit.apache.org From: dbrosius@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111017235238.BEDCA23888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dbrosius Date: Mon Oct 17 23:52:38 2011 New Revision: 1185434 URL: http://svn.apache.org/viewvc?rev=1185434&view=rev Log: fix ignoring of duplicate principal processing Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/report/AclPrincipalReport.java Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/report/AclPrincipalReport.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/report/AclPrincipalReport.java?rev=1185434&r1=1185433&r2=1185434&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/report/AclPrincipalReport.java (original) +++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/report/AclPrincipalReport.java Mon Oct 17 23:52:38 2011 @@ -82,7 +82,7 @@ public class AclPrincipalReport extends List list = (List) ((AclProperty)acl).getValue(); for (AclProperty.Ace ace : list) { String href = ace.getPrincipal().getHref(); - if (href == null && respMap.containsKey(href)) { + if (href == null || respMap.containsKey(href)) { // ignore non-href principals and principals that have been listed before continue; }