jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Angela Schreiber <anch...@adobe.com>
Subject Re: svn commit: r1374986 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionImpl.java
Date Mon, 20 Aug 2012 14:26:53 GMT
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>---
>
>

Mime
View raw message