You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2012/04/13 15:54:51 UTC

svn commit: r1325770 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalIteratorAdapter.java

Author: angela
Date: Fri Apr 13 13:54:50 2012
New Revision: 1325770

URL: http://svn.apache.org/viewvc?rev=1325770&view=rev
Log:
OAK-50 - Implement User Management  (WIP)

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalIteratorAdapter.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalIteratorAdapter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalIteratorAdapter.java?rev=1325770&r1=1325769&r2=1325770&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalIteratorAdapter.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalIteratorAdapter.java Fri Apr 13 13:54:50 2012
@@ -37,7 +37,7 @@ public class PrincipalIteratorAdapter ex
     /**
      * Static instance of an empty {@link PrincipalIterator}.
      */
-    public static final PrincipalIteratorAdapter EMPTY = new PrincipalIteratorAdapter(RangeIteratorAdapter.EMPTY);
+    public static final PrincipalIteratorAdapter EMPTY = new PrincipalIteratorAdapter((Iterator<? extends Principal>) RangeIteratorAdapter.EMPTY);
 
     /**
      * Creates an adapter for the given {@link javax.jcr.RangeIterator}.

Re: svn commit: r1325770 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalIteratorAdapter.java

Posted by Michael Dürig <md...@apache.org>.

On 13.4.12 14:54, angela@apache.org wrote:
> Author: angela
> Date: Fri Apr 13 13:54:50 2012
> New Revision: 1325770
>
> URL: http://svn.apache.org/viewvc?rev=1325770&view=rev
> Log:
> OAK-50 - Implement User Management  (WIP)
>
> Modified:
>      jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalIteratorAdapter.java
>
> Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalIteratorAdapter.java
> URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalIteratorAdapter.java?rev=1325770&r1=1325769&r2=1325770&view=diff
> ==============================================================================
> --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalIteratorAdapter.java (original)
> +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalIteratorAdapter.java Fri Apr 13 13:54:50 2012
> @@ -37,7 +37,7 @@ public class PrincipalIteratorAdapter ex
>       /**
>        * Static instance of an empty {@link PrincipalIterator}.
>        */
> -    public static final PrincipalIteratorAdapter EMPTY = new PrincipalIteratorAdapter(RangeIteratorAdapter.EMPTY);
> +    public static final PrincipalIteratorAdapter EMPTY = new PrincipalIteratorAdapter((Iterator<? extends Principal>) RangeIteratorAdapter.EMPTY);

Oops, sorry ;-)

Michael

>
>       /**
>        * Creates an adapter for the given {@link javax.jcr.RangeIterator}.
>
>