From oak-commits-return-1429-apmail-jackrabbit-oak-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Mon Aug 20 14:27:25 2012 Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B1809DFC9 for ; Mon, 20 Aug 2012 14:27:25 +0000 (UTC) Received: (qmail 71119 invoked by uid 500); 20 Aug 2012 14:27:25 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 71094 invoked by uid 500); 20 Aug 2012 14:27:25 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 71086 invoked by uid 99); 20 Aug 2012 14:27:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Aug 2012 14:27:25 +0000 X-ASF-Spam-Status: No, hits=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of anchela@adobe.com designates 64.18.1.33 as permitted sender) Received: from [64.18.1.33] (HELO exprod6og114.obsmtp.com) (64.18.1.33) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Aug 2012 14:27:16 +0000 Received: from outbound-smtp-1.corp.adobe.com ([192.150.11.134]) by exprod6ob114.postini.com ([64.18.5.12]) with SMTP ID DSNKUDJJMDevaW1MNYEjdl0bQIbugQ0N+3Gn@postini.com; Mon, 20 Aug 2012 07:26:56 PDT Received: from inner-relay-1.corp.adobe.com ([153.32.1.51]) by outbound-smtp-1.corp.adobe.com (8.12.10/8.12.10) with ESMTP id q7KEOPk0024191 for ; Mon, 20 Aug 2012 07:24:25 -0700 (PDT) Received: from nacas03.corp.adobe.com (nacas03.corp.adobe.com [10.8.189.121]) by inner-relay-1.corp.adobe.com (8.12.10/8.12.10) with ESMTP id q7KEQtvm013444 for ; Mon, 20 Aug 2012 07:26:55 -0700 (PDT) Received: from eurhub01.eur.adobe.com (10.128.4.30) by nacas03.corp.adobe.com (10.8.189.121) with Microsoft SMTP Server (TLS) id 8.3.264.0; Mon, 20 Aug 2012 07:26:55 -0700 Received: from angela.corp.adobe.com (10.132.1.18) by eurhub01.eur.adobe.com (10.128.4.111) with Microsoft SMTP Server id 8.3.264.0; Mon, 20 Aug 2012 15:26:53 +0100 Message-ID: <5032492D.7050702@adobe.com> Date: Mon, 20 Aug 2012 16:26:53 +0200 From: Angela Schreiber User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.2.18) Gecko/20110616 Thunderbird/3.1.11 MIME-Version: 1.0 To: Subject: Re: svn commit: r1374986 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionImpl.java References: <20120820121254.62F0D238896F@eris.apache.org> In-Reply-To: <20120820121254.62F0D238896F@eris.apache.org> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org hi michael this commit conflicted with my own modifications on the same code that i was just testing this morning while you committed the patch. i reverted your modification in favor of mine. i am currently committing multiple times every day in order to avoid accumulating huge amount of code that conflicts... and i would really appreciate if you could try to avoid introducing conflicts as well. the security code base is really under heavy construction and most parts are not yet tested. i will do that as i get along... as long as it doesn't cause any failure during oak integration testing i would appreciate if i could work without too many conflicts. thanks angela On 8/20/12 2:12 PM, mduerig@apache.org wrote: > Author: mduerig > Date: Mon Aug 20 12:12:53 2012 > New Revision: 1374986 > > URL: http://svn.apache.org/viewvc?rev=1374986&view=rev > Log: > OAK-257: NPE in o.a.j.oak.security.privilege.PrivilegeDefinitionImpl constructor > patch from Chetan Mehrotra > > Modified: > jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionImpl.java > > Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionImpl.java > URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionImpl.java?rev=1374986&r1=1374985&r2=1374986&view=diff > ============================================================================== > --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionImpl.java (original) > +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionImpl.java Mon Aug 20 12:12:53 2012 > @@ -17,6 +17,7 @@ > package org.apache.jackrabbit.oak.security.privilege; > > import java.util.Set; > + > import javax.annotation.Nonnull; > > import com.google.common.collect.ImmutableSet; > @@ -40,7 +41,7 @@ class PrivilegeDefinitionImpl implements > > PrivilegeDefinitionImpl(String name, boolean isAbstract, > String... declaredAggregateNames) { > - this(name, isAbstract, ImmutableSet.copyOf(declaredAggregateNames)); > + this(name, isAbstract, ImmutableSet.copyOf(declaredAggregateNames == null ? new String[0] : declaredAggregateNames)); > } > > //------------------------------------------------< PrivilegeDefinition>--- > >