directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r658870 - in /directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support: ACDFEngine.java ACITupleFilter.java MaxImmSubFilter.java
Date Wed, 21 May 2008 21:04:45 GMT
Author: elecharny
Date: Wed May 21 14:04:44 2008
New Revision: 658870

URL: http://svn.apache.org/viewvc?rev=658870&view=rev
Log:
fixing issues with Cursor verses NamingEnumeration usage in Interceptors

Modified:
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java?rev=658870&r1=658869&r2=658870&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
Wed May 21 14:04:44 2008
@@ -140,7 +140,7 @@
         Collection<MicroOperation> microOperations, 
         Collection<ACITuple> aciTuples, 
         ServerEntry entry, 
-        ServerEntry entryView ) throws NamingException
+        ServerEntry entryView ) throws Exception
     {
         if ( !hasPermission( registries, proxy, userGroupNames, username, authenticationLevel,
entryName, attrId, attrValue,
             microOperations, aciTuples, entry, entryView ) )
@@ -198,7 +198,7 @@
         Collection<MicroOperation> microOperations, 
         Collection<ACITuple> aciTuples, 
         ServerEntry entry, 
-        ServerEntry entryView ) throws NamingException
+        ServerEntry entryView ) throws Exception
     {
         if ( entryName == null )
         {

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java?rev=658870&r1=658869&r2=658870&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
Wed May 21 14:04:44 2008
@@ -79,5 +79,5 @@
             ServerEntry entry, 
             Collection<MicroOperation> microOperations,
             ServerEntry entryView )
-        throws NamingException;
+        throws Exception;
 }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?rev=658870&r1=658869&r2=658870&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
Wed May 21 14:04:44 2008
@@ -23,6 +23,7 @@
 import org.apache.directory.server.core.authn.AuthenticationInterceptor;
 import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
 import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
+import org.apache.directory.server.core.cursor.Cursor;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.entry.ServerSearchResult;
 import org.apache.directory.server.core.event.EventInterceptor;
@@ -89,7 +90,7 @@
             ServerEntry entry, 
             Collection<MicroOperation> microOperations,
             ServerEntry entryView )
-        throws NamingException
+        throws Exception
     {
         if ( entryName.size() == 0 )
         {
@@ -158,19 +159,19 @@
     }
 
 
-    private int getImmSubCount( Registries registries, PartitionNexusProxy proxy, LdapDN
entryName ) throws NamingException
+    private int getImmSubCount( Registries registries, PartitionNexusProxy proxy, LdapDN
entryName ) throws Exception
     {
         int cnt = 0;
-        NamingEnumeration<ServerSearchResult> e = null;
+        Cursor<ServerEntry> e = null;
         
         try
         {
             e = proxy.search( new SearchOperationContext( registries, ( LdapDN ) entryName.getPrefix(
1 ),
                     AliasDerefMode.DEREF_ALWAYS, childrenFilter, childrenSearchControls ),
SEARCH_BYPASS );
 
-            while ( e.hasMore() )
+            while ( e.next() )
             {
-                e.next();
+                e.get();
                 cnt++;
             }
 



Mime
View raw message