You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/06/03 01:20:03 UTC
svn commit: r950815 - in /directory/apacheds/trunk:
core-api/src/main/java/org/apache/directory/server/core/
core-api/src/main/java/org/apache/directory/server/core/interceptor/
core-api/src/main/java/org/apache/directory/server/core/partition/ core-ap...
Author: elecharny
Date: Wed Jun 2 23:20:02 2010
New Revision: 950815
URL: http://svn.apache.org/viewvc?rev=950815&view=rev
Log:
The unbind operation now throws an LdapException instead of an Exception. Applied the modification on all the impacted classes and interfaces.
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockInterceptor.java
directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperationManager.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java
directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java Wed Jun 2 23:20:02 2010
@@ -154,5 +154,5 @@ public interface OperationManager
/**
* TODO document after determining if this method should be here.
*/
- void unbind( UnbindOperationContext opContext ) throws Exception;
+ void unbind( UnbindOperationContext opContext ) throws LdapException;
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java Wed Jun 2 23:20:02 2010
@@ -238,7 +238,7 @@ public abstract class BaseInterceptor im
}
- public void unbind( NextInterceptor next, UnbindOperationContext opContext ) throws Exception
+ public void unbind( NextInterceptor next, UnbindOperationContext opContext ) throws LdapException
{
next.unbind( opContext );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java Wed Jun 2 23:20:02 2010
@@ -247,5 +247,5 @@ public interface Interceptor
/**
* Filters {@link Partition#unbind( UnbindOperationContext )} call.
*/
- void unbind( NextInterceptor next, UnbindOperationContext opContext ) throws Exception;
+ void unbind( NextInterceptor next, UnbindOperationContext opContext ) throws LdapException;
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java Wed Jun 2 23:20:02 2010
@@ -211,7 +211,7 @@ public class InterceptorChain
}
- public void unbind( NextInterceptor next, UnbindOperationContext opContext ) throws Exception
+ public void unbind( NextInterceptor next, UnbindOperationContext opContext ) throws LdapException
{
nexus.unbind( opContext );
}
@@ -792,7 +792,7 @@ public class InterceptorChain
}
- public void unbind( UnbindOperationContext opContext ) throws Exception
+ public void unbind( UnbindOperationContext opContext ) throws LdapException
{
Element node = getStartingEntry();
Interceptor head = node.interceptor;
@@ -802,9 +802,9 @@ public class InterceptorChain
{
head.unbind( next, opContext );
}
- catch ( Exception ne )
+ catch ( LdapException le )
{
- throw ne;
+ throw le;
}
catch ( Throwable e )
{
@@ -1392,7 +1392,7 @@ public class InterceptorChain
}
- public void unbind( UnbindOperationContext opContext ) throws Exception
+ public void unbind( UnbindOperationContext opContext ) throws LdapException
{
Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
@@ -1401,9 +1401,9 @@ public class InterceptorChain
{
interceptor.unbind( next.nextInterceptor, opContext );
}
- catch ( Exception ne )
+ catch ( LdapException le )
{
- throw ne;
+ throw le;
}
catch ( Throwable e )
{
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java Wed Jun 2 23:20:02 2010
@@ -167,5 +167,5 @@ public interface NextInterceptor
/**
* Calls the next interceptor's {@link Interceptor#unbind( NextInterceptor, UnbindOperationContext )}
*/
- void unbind( UnbindOperationContext opContext ) throws Exception;
+ void unbind( UnbindOperationContext opContext ) throws LdapException;
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java Wed Jun 2 23:20:02 2010
@@ -358,7 +358,7 @@ public class NullPartition extends Abstr
/* (non-Javadoc)
* @see org.apache.directory.server.core.partition.Partition#unbind(org.apache.directory.server.core.interceptor.context.UnbindOperationContext)
*/
- public void unbind( UnbindOperationContext opContext ) throws Exception
+ public void unbind( UnbindOperationContext opContext ) throws LdapException
{
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java Wed Jun 2 23:20:02 2010
@@ -292,5 +292,5 @@ public interface Partition
* @param opContext the context used to unbind
* @throws Exception if something goes wrong
*/
- void unbind( UnbindOperationContext opContext ) throws Exception;
+ void unbind( UnbindOperationContext opContext ) throws LdapException;
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java Wed Jun 2 23:20:02 2010
@@ -433,7 +433,7 @@ public final class SchemaPartition exten
/* (non-Javadoc)
* @see org.apache.directory.server.core.partition.Partition#unbind(org.apache.directory.server.core.interceptor.context.UnbindOperationContext)
*/
- public void unbind( UnbindOperationContext opContext ) throws Exception
+ public void unbind( UnbindOperationContext opContext ) throws LdapException
{
wrapped.unbind( opContext );
}
Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockInterceptor.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockInterceptor.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockInterceptor.java Wed Jun 2 23:20:02 2010
@@ -223,7 +223,7 @@ public class MockInterceptor implements
}
- public void unbind( NextInterceptor next, UnbindOperationContext opContext ) throws Exception
+ public void unbind( NextInterceptor next, UnbindOperationContext opContext ) throws LdapException
{
interceptors.add( this );
next.unbind( opContext );
Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperationManager.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperationManager.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperationManager.java Wed Jun 2 23:20:02 2010
@@ -132,7 +132,7 @@ public class MockOperationManager implem
}
- public void unbind( UnbindOperationContext opContext ) throws Exception
+ public void unbind( UnbindOperationContext opContext ) throws LdapException
{
}
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java Wed Jun 2 23:20:02 2010
@@ -1092,7 +1092,7 @@ public class DefaultOperationManager imp
/**
* {@inheritDoc}
*/
- public void unbind( UnbindOperationContext opContext ) throws Exception
+ public void unbind( UnbindOperationContext opContext ) throws LdapException
{
LOG.debug( ">> UnbindOperation : {}", opContext );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java Wed Jun 2 23:20:02 2010
@@ -605,7 +605,7 @@ public class TimerInterceptor implements
/**
* {@inheritDoc}
*/
- public void unbind( NextInterceptor next, UnbindOperationContext opContext ) throws Exception
+ public void unbind( NextInterceptor next, UnbindOperationContext opContext ) throws LdapException
{
long t0 = System.nanoTime();
next.unbind( opContext );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Wed Jun 2 23:20:02 2010
@@ -926,7 +926,7 @@ public class DefaultPartitionNexus exten
/* (non-Javadoc)
* @see org.apache.directory.server.core.partition.PartitionNexus#unbind(org.apache.directory.server.core.interceptor.context.UnbindOperationContext)
*/
- public void unbind( UnbindOperationContext unbindContext ) throws Exception
+ public void unbind( UnbindOperationContext unbindContext ) throws LdapException
{
Partition partition = getPartition( unbindContext.getDn() );
partition.unbind( unbindContext );
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Wed Jun 2 23:20:02 2010
@@ -1003,7 +1003,7 @@ public class MaxImmSubFilterTest
}
- public void unbind( UnbindOperationContext opContext ) throws Exception
+ public void unbind( UnbindOperationContext opContext ) throws LdapException
{
}
}
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java Wed Jun 2 23:20:02 2010
@@ -217,7 +217,7 @@ public class MockInterceptor implements
}
- public void unbind( NextInterceptor next, UnbindOperationContext opContext ) throws Exception
+ public void unbind( NextInterceptor next, UnbindOperationContext opContext ) throws LdapException
{
test.interceptors.add( this );
next.unbind( opContext );
Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java Wed Jun 2 23:20:02 2010
@@ -947,7 +947,7 @@ public class LdifPartition extends BTree
}
- public void unbind( UnbindOperationContext unbindContext ) throws Exception
+ public void unbind( UnbindOperationContext unbindContext ) throws LdapException
{
wrappedPartition.unbind( unbindContext );
}
Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java?rev=950815&r1=950814&r2=950815&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java Wed Jun 2 23:20:02 2010
@@ -347,7 +347,7 @@ public abstract class AbstractXdbmPartit
}
- public final void unbind( UnbindOperationContext unbindContext ) throws Exception
+ public final void unbind( UnbindOperationContext unbindContext ) throws LdapException
{
}