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 2014/05/17 15:51:28 UTC
svn commit: r1595482 - in /directory/apacheds/trunk:
core-shared/src/main/java/org/apache/directory/server/core/shared/
mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/
Author: elecharny
Date: Sat May 17 13:51:27 2014
New Revision: 1595482
URL: http://svn.apache.org/r1595482
Log:
Fixed some compilation failures due to the modifications done in mavibot trunk
Modified:
directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/SortedEntryCursor.java
directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotCursor.java
directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotTable.java
Modified: directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java?rev=1595482&r1=1595481&r2=1595482&view=diff
==============================================================================
--- directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java (original)
+++ directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java Sat May 17 13:51:27 2014
@@ -76,6 +76,7 @@ import org.apache.directory.mavibot.btre
import org.apache.directory.mavibot.btree.PersistedBTreeConfiguration;
import org.apache.directory.mavibot.btree.RecordManager;
import org.apache.directory.mavibot.btree.exception.BTreeAlreadyManagedException;
+import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
import org.apache.directory.mavibot.btree.serializer.StringSerializer;
import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.api.CoreSession;
@@ -1301,9 +1302,10 @@ public class DefaultCoreSession implemen
* @throws CursorException
* @throws LdapException
* @throws IOException
+ * @throws KeyNotFoundException
*/
private Cursor<Entry> sortResults( Cursor<Entry> unsortedEntries, SortRequest control, SchemaManager schemaManager )
- throws CursorException, LdapException, IOException
+ throws CursorException, LdapException, IOException, KeyNotFoundException
{
unsortedEntries.beforeFirst();
Modified: directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/SortedEntryCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/SortedEntryCursor.java?rev=1595482&r1=1595481&r2=1595482&view=diff
==============================================================================
--- directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/SortedEntryCursor.java (original)
+++ directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/SortedEntryCursor.java Sat May 17 13:51:27 2014
@@ -34,6 +34,7 @@ import org.apache.directory.mavibot.btre
import org.apache.directory.mavibot.btree.RecordManager;
import org.apache.directory.mavibot.btree.Tuple;
import org.apache.directory.mavibot.btree.TupleCursor;
+import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
import org.apache.directory.server.core.api.filtering.EntryFilter;
import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext;
@@ -59,7 +60,7 @@ public class SortedEntryCursor extends A
private File dataFile;
- public SortedEntryCursor( BTree<Entry,String> btree, RecordManager recMan, File dataFile ) throws IOException
+ public SortedEntryCursor( BTree<Entry,String> btree, RecordManager recMan, File dataFile ) throws IOException, KeyNotFoundException
{
this.recMan = recMan;
this.dataFile = dataFile;
Modified: directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotCursor.java?rev=1595482&r1=1595481&r2=1595482&view=diff
==============================================================================
--- directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotCursor.java (original)
+++ directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotCursor.java Sat May 17 13:51:27 2014
@@ -27,6 +27,7 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.cursor.Tuple;
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.mavibot.btree.TupleCursor;
+import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
import org.apache.directory.server.i18n.I18n;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -218,6 +219,10 @@ class MavibotCursor<K, V> extends Abstra
{
throw new CursorException( e );
}
+ catch ( KeyNotFoundException knfe )
+ {
+ throw new CursorException( knfe );
+ }
}
@@ -242,6 +247,10 @@ class MavibotCursor<K, V> extends Abstra
{
throw new CursorException( e );
}
+ catch ( KeyNotFoundException knfe )
+ {
+ throw new CursorException( knfe );
+ }
}
Modified: directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotTable.java?rev=1595482&r1=1595481&r2=1595482&view=diff
==============================================================================
--- directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotTable.java (original)
+++ directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotTable.java Sat May 17 13:51:27 2014
@@ -23,6 +23,7 @@ package org.apache.directory.server.core
import java.io.IOException;
import org.apache.directory.api.ldap.model.cursor.Cursor;
+import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.EmptyCursor;
import org.apache.directory.api.ldap.model.cursor.SingletonCursor;
import org.apache.directory.api.ldap.model.cursor.Tuple;
@@ -121,11 +122,23 @@ public class MavibotTable<K, V> extends
/**
* {@inheritDoc}
+ * @throws
*/
@Override
- public boolean has( K key ) throws IOException
+ public boolean has( K key ) throws LdapException
{
- return bt.hasKey( key );
+ try
+ {
+ return bt.hasKey( key );
+ }
+ catch ( IOException ioe )
+ {
+ throw new LdapException( ioe );
+ }
+ catch ( KeyNotFoundException knfe )
+ {
+ throw new LdapException( knfe );
+ }
}