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 B6873CC1F for ; Mon, 20 Aug 2012 12:13:38 +0000 (UTC) Received: (qmail 2095 invoked by uid 500); 20 Aug 2012 12:13:38 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 2064 invoked by uid 500); 20 Aug 2012 12:13:38 -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 2055 invoked by uid 99); 20 Aug 2012 12:13:38 -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 12:13:38 +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, 20 Aug 2012 12:13:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 62F0D238896F; Mon, 20 Aug 2012 12:12:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1374986 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionImpl.java Date: Mon, 20 Aug 2012 12:12:54 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120820121254.62F0D238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 >---